Re: Merge problem with different users

2010-09-03 Thread Stefan Sperling
On Fri, Sep 03, 2010 at 12:53:34AM -0700, Ungruhe, Michael wrote: Hi, We noticed the following problem: We are usually working on the trunk, but for a change request we created a branch. Development continued on both, the trunk and the branch. Some changes were made on the

SVN Functionality: loss of locks when switching to a branch

2010-09-03 Thread REYNOLDS, Dylan
My SVN versions - apologies if anything I write is out of date: TortoiseSVN 1.6.5, Build 16974 - 32 Bit , 2009/08/20 08:13:46 Subversion 1.6.5, I am currently working on a project with file that cannot be merged and hence require the use of locks and svn:needs-lock. Even though we want to use

Re: SVN Functionality: loss of locks when switching to a branch

2010-09-03 Thread Ulrich Eckhardt
On Friday 03 September 2010, REYNOLDS, Dylan wrote: [locking a file and switching the WC loses the lock info for the WC] In my opinion, if the lock exists in the repository, under your user name, then why can't this information be pushed in to your working copy when you make the

Re: SVN 1.6.12 crash on merge.

2010-09-03 Thread Andy Levy
Please don't reply to me, reply to all to keep discussion on the mailing list. I believe the Slik maintainer posted yesterday that there was a problem with the 1.6.12 build and a new version is on the way. On Fri, Sep 3, 2010 at 05:01, Pavel Ivanov pavel.iva...@acronis.com wrote: The bug does

Re: SVN 1.6.12 crash on merge.

2010-09-03 Thread ankush chadha
I also faced the same issue with slikSVN and it was throwing a dump but when I switched to colabnet binaries, it was working fine. Ankush

Re: SVN 1.6.12 crash on merge.

2010-09-03 Thread Andy Levy
On Fri, Sep 3, 2010 at 09:02, ankush chadha ankushchadha2...@yahoo.com wrote: I also faced the same issue with slikSVN and it was throwing a dump but when I switched to colabnet binaries, it was working fine. http://svn.haxx.se/users/archive-2010-09/0065.shtml

Re: Scripting an svn:externals change

2010-09-03 Thread BRM
- Original Message From: Ryan Schmidt subversion-20...@ryandesign.com $ cat Example1.dump | sed 's/file:\/\/\/svnTest\/Example1/file:\/\/\/svnTest\/Example2/' Example1-edited.dump Do not use sed to edit a dumpfile. Use a tool designed for the task, like svndumptool.

Understanding svn:eol-style interactions with other properties

2010-09-03 Thread stevecoh1
I am trying to adapt a legacy system written in C to use SVN for version control. This legacy system has components that are built and run on linux and also other components that are built and run on MS-DOS (yes, MS-DOS, although eventually it's going away!). Development will, for the most

svn --recursive propset fails Is a directory

2010-09-03 Thread stevecoh1
Using the subversive eclipse plugin, I am able to do the equivalent of svn --recursive propset svn:eol-style native . But on the command line itself this fails with svn: Can't read file 'subdir': Is a directory What is the value of the --recursive switch if it doesn't handle this? Or am I

Re: Scripting an svn:externals change

2010-09-03 Thread Daniel Shahaf
Ryan Schmidt wrote on Fri, Sep 03, 2010 at 15:29:17 -0500: the dump format does not include information about hook scripts, config files or locks. If you dump and load, the new repository will have the default hook script templates (so, no hook scripts), the default configuration, and nothing

Re: Scripting an svn:externals change

2010-09-03 Thread BRM
- Original Message From: Ryan Schmidt subversion-20...@ryandesign.com To: BRM bm_witn...@yahoo.com Since the UUID has changed, everyone must check out new working copies; it is not possible to update or switch existing working copies to this new changed repository.