Re: Reverse merge with 1.8.3 yielded tree conflicts

2013-09-09 Thread Stefan Sperling
On Mon, Sep 09, 2013 at 02:37:05PM +0100, James French wrote: > Hi, > > I got a report today of svn 1.8.3 (tortoise 1.8.2) producing tree conflicts > when a sync up merge was reverted. I ran the merge again with 1.8.3 to > confirm the issue and again using 1.7.8 command line (which worked). See

RE: Reverse merge with 1.8.3 yielded tree conflicts

2013-09-09 Thread James French
Thanks for the explanation Stefan. Glad svn is working properly :-) -Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: 09 September 2013 15:55 To: James French Cc: users@subversion.apache.org Subject: Re: Reverse merge with 1.8.3 yielded tree conflicts On Mon, Sep 09

Reverse merge with 1.8.3 yielded tree conflicts

2013-09-09 Thread James French
Hi, I got a report today of svn 1.8.3 (tortoise 1.8.2) producing tree conflicts when a sync up merge was reverted. I ran the merge again with 1.8.3 to confirm the issue and again using 1.7.8 command line (which worked). See the status reports below (a bit hacked manually to remove some sensitiv