Re: [Issue 2685] Move + Merge = lose modifications

2011-08-29 Thread Stefan Sperling
On Fri, Aug 26, 2011 at 04:00:15PM +0300, Daniel Shahaf wrote: I tested with rc1, and now with trunk, and in both cases a tree conflict is reported on the node that was modified on branch and modified+moved-away on trunk. From Stefan's commit messages I expected the issue to be fixed on

Re: [Issue 2685] Move + Merge = lose modifications

2011-08-26 Thread Daniel Shahaf
jcor...@tigris.org wrote on Fri, Aug 26, 2011 at 04:38:07 -0700: http://subversion.tigris.org/issues/show_bug.cgi?id=2685 --- Additional comments from jcor...@tigris.org Fri Aug 26 04:38:06 -0700 2011 --- Wouldn't it be better to repurpose this issue, rather than marking

Re: [Issue 2685] Move + Merge = lose modifications

2011-08-26 Thread Johan Corveleyn
On Fri, Aug 26, 2011 at 2:02 PM, Daniel Shahaf d...@daniel.shahaf.name wrote: jcor...@tigris.org wrote on Fri, Aug 26, 2011 at 04:38:07 -0700: http://subversion.tigris.org/issues/show_bug.cgi?id=2685 --- Additional comments from jcor...@tigris.org Fri Aug 26 04:38:06 -0700 2011 ---

Re: [Issue 2685] Move + Merge = lose modifications

2011-08-26 Thread Daniel Shahaf
Johan Corveleyn wrote on Fri, Aug 26, 2011 at 14:32:31 +0200: On Fri, Aug 26, 2011 at 2:02 PM, Daniel Shahaf d...@daniel.shahaf.name wrote: jcor...@tigris.org wrote on Fri, Aug 26, 2011 at 04:38:07 -0700: http://subversion.tigris.org/issues/show_bug.cgi?id=2685 --- Additional