Re: Junior developers

2010-02-18 Thread dcz
Le 17/02/2010 18:34, Ryan Schmidt a écrit : On Feb 17, 2010, at 08:36, dcz wrote: Le 17/02/2010 15:24, Andy Levy a écrit : There is no "dry run" for a commit. It's conceivable that you could check the user ID in the pre-commit, and if the committer is JD, reject the com

Re: Junior developers

2010-02-18 Thread dcz
Hello, Yes, could be a solution, use branches, but I would like to avoid the one branch per JD situation also. I'm currently investigating over review board if you have thoughts to share. FYI the trunk is indeed intended a stable stream. Le 17/02/2010 23:37, Srilakshmanan, Lakshman a écrit :

merge doesn't merge changes

2010-02-18 Thread Chris Withers
Hi All, The repo in question is public, so please feel free to attempt the same thing here and tell me what I'm doing wrong. So, the story is that I was doing development on trunk, but I needed to branch off to do some changes while not releasing the stuff I currently had to trunk. So, trunk

Reorganizing a live tree

2010-02-18 Thread Kenneth Porter
If I move a file (say, to a new subdirectory) and commit, and another user then edits the file from a pre-move WC, what happens when he updates his WC? Do his edits get merged to the file in the new location?

Re: Reorganizing a live tree

2010-02-18 Thread Stefan Sperling
On Thu, Feb 18, 2010 at 02:49:35AM -0800, Kenneth Porter wrote: > If I move a file (say, to a new subdirectory) and commit, and > another user then edits the file from a pre-move WC, what happens > when he updates his WC? Do his edits get merged to the file in the > new location? See http://svnboo

version at which non-interactive was added to svn add

2010-02-18 Thread lasdka 88
I am trying to find out the version at which the --non-interactive option was added to svn add command. I've had a look through the release notes but I can't find it. I know that it was after 1.4.2. Is anyone able to help me? In general, what is the best way of finding out the version at which a p

Re: merge doesn't merge changes - bug, but in which version?

2010-02-18 Thread Chris Withers
Chris Withers wrote: - svn co https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/branches/1.8 - svn merge -r 4195:HEAD https://secure.simplistix.co.uk/svn/Simplistix/testfixtures/trunk . Except this merges no changes :-( Okay, so the server runs svn as supplied in debian stable, w

Q: Command to get a file from a particular revision

2010-02-18 Thread Manickavel, Senthil
Hi, What's the command to get a file from a particular revision? I tried with "svn checkout". It takes only the directory URL. D:\>svn checkout -r 27240 https://Build.net/RAD/rad.profile.install . svn: URL 'https://Build.net/RAD/rad.profile.install' refers to a file, not a directory

Re: Q: Command to get a file from a particular revision

2010-02-18 Thread Felix Gilcher
Hi, as the error message says, you cannot check out a single file. The smallest unit that can be checked out is a directory. You can either check out the parent directory (possibly using sparse checkouts to limit what items you pull) or use svn cat -r . However, svn cat will not create a wor

Re: version at which non-interactive was added to svn add

2010-02-18 Thread Andy Levy
On Wed, Feb 17, 2010 at 21:23, lasdka 88 wrote: > I am trying to find out the version at which the --non-interactive > option was added to svn add command. I've had a look through the > release notes but I can't find it. I know that it was after 1.4.2. Is > anyone able to help me? Features are ve

Re: version at which non-interactive was added to svn add

2010-02-18 Thread Stefan Sperling
On Thu, Feb 18, 2010 at 08:42:10AM -0500, Andy Levy wrote: > On Wed, Feb 17, 2010 at 21:23, lasdka 88 wrote: > > I am trying to find out the version at which the --non-interactive > > option was added to svn add command. I've had a look through the > > release notes but I can't find it. I know tha

SVNParentPath + Recurse (or recursive)

2010-02-18 Thread Geert van Horrik
Hi all, Is this feature planned on the roadmap? I have seen a lot of requests on the internet about this feature. What I want is this: /svn /svn/companies /svn/companies/mycompany /svn/companies/mycompany/product1 * /svn/companies/mycompany/product2 * /svn/companies/mycompany/product3 * /svn/com

Branch from a branch -- will merges still work?

2010-02-18 Thread Jacob Weber
I'm wondering if the following pattern will work: - a branch A from trunk, where features are developed, before they're released into trunk - a branch AA from A, where more experimental features are developed, before they're released into A, and then eventually into trunk. This way, while A's f

Partially reintegrate changes

2010-02-18 Thread Jacob Weber
Let's say I have a branch where I develop two features, X and Y. I then want to merge only X back into the trunk. I want to do some further development on Y, and merge it into trunk later. Is this possible with Subversion? If I do a reintegrate into trunk, I could revert all the changes for Y,

Re: Partially reintegrate changes

2010-02-18 Thread Mark Phippard
On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > Let's say I have a branch where I develop two features, X and Y. I then want > to merge only X back > into the trunk. I want to do some further development on Y, and merge it into > trunk later. > > Is this possible with Subversion? Yes. Wh

Re: SVNParentPath + Recurse (or recursive)

2010-02-18 Thread C. Michael Pilato
Geert van Horrik wrote: > Hi all, > > Is this feature planned on the roadmap? I have seen a lot of requests on > the internet about this feature. What I want is this: > > /svn > /svn/companies > /svn/companies/mycompany > /svn/companies/mycompany/product1 * > /svn/companies/mycompany/product2 *

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Rob van Oostrum
On Thu, Feb 18, 2010 at 10:17 AM, Jacob Weber wrote: > I'm wondering if the following pattern will work: > > - a branch A from trunk, where features are developed, before they're > released into trunk > - a branch AA from A, where more experimental features are developed, > before they're release

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Jacob Weber
On Feb 18, 2010, at 8:00 AM, Rob van Oostrum wrote: > On Thu, Feb 18, 2010 at 10:17 AM, Jacob Weber wrote: > My concern is this: > After we reintegrate from A into trunk, we'll need to revert A to trunk > (according to my understanding of reintegrate merges.) So once we do that, > will we stil

Re: Partially reintegrate changes

2010-02-18 Thread Jacob Weber
On Feb 18, 2010, at 7:37 AM, Mark Phippard wrote: > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: >> Let's say I have a branch where I develop two features, X and Y. I then want >> to merge only X back >> into the trunk. I want to do some further development on Y, and merge it >> into tr

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Rob van Oostrum
On Thu, Feb 18, 2010 at 11:19 AM, Jacob Weber wrote: > > On Feb 18, 2010, at 8:00 AM, Rob van Oostrum wrote: > > On Thu, Feb 18, 2010 at 10:17 AM, Jacob Weber wrote: > >> My concern is this: >> After we reintegrate from A into trunk, we'll need to revert A to trunk >> (according to my understandi

Re: Partially reintegrate changes

2010-02-18 Thread Tyler Roscoe
On Thu, Feb 18, 2010 at 08:20:10AM -0800, Jacob Weber wrote: > > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > >> Let's say I have a branch where I develop two features, X and Y. I then > >> want to merge only X back > >> into the trunk. I want to do some further development on Y, and mer

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Stefan Sperling
On Thu, Feb 18, 2010 at 11:22:36AM -0500, Rob van Oostrum wrote: > On Thu, Feb 18, 2010 at 11:19 AM, Jacob Weber wrote: > > Do you mean that I don't need to delete my branch after a reintegrate, as > > suggested here: > > > > > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.

Re: Partially reintegrate changes

2010-02-18 Thread Stein Somers
Maybe the self-referential mergeinfo I saw was being introduced some other way. I see some self-refenertial mergeinfo in our /trunk, after lots of merges to and from. Maybe I explicitly added it with a record-only in some state of confusion. But it doesn't scare me at all. It would only matte

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Jacob Weber
Nice! Stefan, if you're the one who added it, you might also want to link to it in the section I mentioned, where it says "once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work". Jacob On Feb 18, 2010, at 8:51 AM, Stefan Sperling wrote: > O

Re: Branch from a branch -- will merges still work?

2010-02-18 Thread Stefan Sperling
On Thu, Feb 18, 2010 at 09:37:01AM -0800, Jacob Weber wrote: > Stefan, if you're the one who added it, you might also want to link to > it in the section I mentioned, where it says "once a --reintegrate > merge is done from branch to trunk, the branch is no longer usable for > further work". Good

Re: version at which non-interactive was added to svn add

2010-02-18 Thread lasdka 88
Thank you all for your responses. The project is web application using PHP. I initially looked at using the PECL SVN extension (http://pecl.php.net/package/svn) so that I could access the SVN API that way. However, there are several problems with that. 1. It's experimental 2. I want the users to b

Re: version at which non-interactive was added to svn add

2010-02-18 Thread Stefan Sperling
On Thu, Feb 18, 2010 at 06:23:03PM +, lasdka 88 wrote: > Is there a > particular place where the command line options are listed in the > source code for SVN? Perhaps I could check it out of source control > and verify the arguments that way? See the svn_cl__options (defining the options) tabl

Re: Partially reintegrate changes

2010-02-18 Thread Jacob Weber
Stein Somers: > I see some self-refenertial mergeinfo in our /trunk, after lots of > merges to and from. Maybe I explicitly added it with a record-only in > some state of confusion. But it doesn't scare me at all. It would only > matter if you explicitly merged /trunk to /trunk. And then, as far

Re: SVNParentPath + Recurse (or recursive)

2010-02-18 Thread Michael P. Reilly
On Thu, Feb 18, 2010 at 9:44 AM, Geert van Horrik wrote: > Hi all, > > Is this feature planned on the roadmap? I have seen a lot of requests on > the internet about this feature. What I want is this: > > /svn > /svn/companies > /svn/companies/mycompany > /svn/companies/mycompany/product1 * > /svn

RE: SVNParentPath + Recurse (or recursive)

2010-02-18 Thread Bob Archer
> On Thu, Feb 18, 2010 at 9:44 AM, Geert van Horrik > wrote: > Hi all, > > Is this feature planned on the roadmap? I have seen a lot of requests on > the internet about this feature. What I want is this: > > /svn > /svn/companies > /svn/companies/mycompany > /svn/companies/mycompany/product1 * >

Re: version at which non-interactive was added to svn add

2010-02-18 Thread lasdka 88
On 18 February 2010 18:36, Stefan Sperling wrote: > See the svn_cl__options (defining the options) table, and the > svn_cl__cmd_table table (defining valid options for every subcommand) > in main.c: > http://svn.apache.org/repos/asf/subversion/trunk/subversion/svn/main.c > > Some 'svn blame' and '

Re: Partially reintegrate changes

2010-02-18 Thread Rob van Oostrum
On Thu, Feb 18, 2010 at 1:42 PM, Jacob Weber wrote: > Stein Somers: > > I see some self-refenertial mergeinfo in our /trunk, after lots of > > merges to and from. Maybe I explicitly added it with a record-only in > > some state of confusion. But it doesn't scare me at all. It would only > > matte

Re: merge doesn't merge changes

2010-02-18 Thread Rob van Oostrum
On Thu, Feb 18, 2010 at 5:19 AM, Chris Withers wrote: > Hi All, > > The repo in question is public, so please feel free to attempt the same > thing here and tell me what I'm doing wrong. > > So, the story is that I was doing development on trunk, but I needed to > branch off to do some changes whi

Making same source available in 2 areas of the repository

2010-02-18 Thread Tony Martin
Hi I have an application that is made up of a windows executable and several dll's. One of these dll's needs to be worked on directly to develop and bug fix, however it must also be deployed as source to allow changes and recompiles when the application suite is deployed to production. (P

Re: Making same source available in 2 areas of the repository

2010-02-18 Thread Tyler Roscoe
On Fri, Feb 19, 2010 at 10:07:10AM +1100, Tony Martin wrote: > I have an application that is made up of a windows executable and > several dll's. One of these dll's needs to be worked on directly to > develop and bug fix, however it must also be deployed as source to > allow changes and recom

dumpfilter exclude question

2010-02-18 Thread Justin Connell
Hi, If I use a dumpfilter exclude /parentpath/folder_to_drop will the content of the parentpath be preserved? Thanks Justin

Network repository

2010-02-18 Thread Vicky Chester
Hi all, I'm looking at setting up an SVN repository using apache. I'd like to be able to put the repository folder onto a shared network drive and have apache run on a separate PC. The network drive gets backed up every night whereas the PC doesn't, hense the split. When I've been looking round h

subversion 1.6 hanging when used with gnome-keyring 2.28

2010-02-18 Thread Ben Hall
Hi all, I've encountered a problem whereby svn operations to an authenticated apache2 server are hanging indefinitely. It happens erratically but often enough that it's normally reproducible within 20 operations. I'm using ubuntu 9.10 on the client side. I've reproduced this with subversio