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

'svn up' may cause inconsistent mergeinfo

From: Stefan Fuhrmann <stefan.fuhrmann_at_wandisco.com>
Date: Thu, 11 Dec 2014 10:39:12 +0100

Hi,

There is yet another problem with sub-tree mergeinfo:

(1) User A performs a sub-tree merge causing the mi property
  to be added to the sub-node. No commit, yet.
(2) User B commits a merge at the branch root, modifying its m/i.
(3) User A updates and commits their merge.

Now, the sub-tree mergeinfo does not reflect the changes
made to the root node m/i. If the latter are operative on that
sub-tree, the data is inconsistent and can create conflicts.

The attached script demonstrates the problem.

-- Stefan^2.
Received on 2014-12-11 10:39:46 CET

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