On Thu, Dec 11, 2014 at 10:39 AM, Stefan Fuhrmann < stefan.fuhrm...@wandisco.com> wrote:
> 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. > ... and there is the script.
mergeinfo-inconsistency.sh
Description: Bourne shell script
