Re: Merging copy operations

2011-08-11 Thread Ulrich Eckhardt
On Wednesday 10 August 2011, Johan Corveleyn wrote: > I think what you're describing is issue #2685: > > http://subversion.tigris.org/issues/show_bug.cgi?id=2685 (Move + Merge > => lose modifications) Yes, this is exactly what I was stumbling over. Thanks to Andreas and Stefan, too, that explain

Re: Merging copy operations

2011-08-11 Thread Stefan Sperling
On Thu, Aug 04, 2011 at 12:24:38PM +0200, Ulrich Eckhardt wrote: > Hi! > > I'm refactoring code and in that context I moved parts of one file to a > separate file, so I copied trunk/A to trunk/B and then hacked the two so that > each contained one part of the code. Then, when the whole works aga

Re: Merging copy operations

2011-08-11 Thread Andreas Krey
On Wed, 10 Aug 2011 23:54:24 +, Johan Corveleyn wrote: ... > I think what you're describing is issue #2685: > > http://subversion.tigris.org/issues/show_bug.cgi?id=2685 (Move + Merge > => lose modifications) ... > Also, I'm not sure if mergeinfo will be a problem. Maybe you should > just try i

Re: Merging copy operations

2011-08-10 Thread Johan Corveleyn
On Thu, Aug 4, 2011 at 12:24 PM, Ulrich Eckhardt wrote: > Hi! > > I'm refactoring code and in that context I moved parts of one file to a > separate file, so I copied trunk/A to trunk/B and then hacked the two so that > each contained one part of the code. Then, when the whole works again, I > com

Merging copy operations

2011-08-04 Thread Ulrich Eckhardt
Hi! I'm refactoring code and in that context I moved parts of one file to a separate file, so I copied trunk/A to trunk/B and then hacked the two so that each contained one part of the code. Then, when the whole works again, I commit the whole in a commit. First question here: I consider that a