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

Issue #4545, 'svn up' may cause inconsistent mergeinfo

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 22 Dec 2014 16:21:25 +0000

This is filed as issue #4545,
http://subversion.tigris.org/issues/show_bug.cgi?id=4545

- Julian

Stefan Fuhrmann wrote:

> 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.
Received on 2014-12-22 17:24:22 CET

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