[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

The tree conflict improvements in 1.7

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Wed, 21 Sep 2011 12:36:34 +0100

I understand that 1.7 brings better user-visible behaviour of tree
conflicts, of a kind enabled by WC-NG: in "svn update", for example, I
think the base version in the WC is now always updated underneath any
tree conflict victim, which means no further update should be required
after resolving. I haven't tested that, so may not be quite right.

In CHANGES I can see notes about a few minor improvements to conflict
reporting and bug fixes to conflict detection, but nothing about the
above kind. Are there other improvements worth mentioning?

- Julian
Received on 2011-09-21 13:37:13 CEST

This is an archived mail posted to the Subversion Dev mailing list.