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

Re: [merge tracking] [RFC] New merging algorithm

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-03-12 13:16:06 CET

> So, we have four merge steps instead of 7. Conflicts at the first step
> will leave the tree in the same inconsistent state as the current
> algorithm. The rest of the steps, though, keeps the whole tree in
> sync. On conflicts in the first step, we could, as earlier, bring A
> up to revision four, again risking to introduce spurious conflicts.
>
> Another improvements in my proposed algorithm is to avoid merging
> paths that are going to be deleted later on.
>
> I hope this clarifies what I'm trying to get at;)
> //Peter
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>

Your idea looks cool.
But I still fail to understand the 'Consistency concern' you have out
here. Can You explain it?
Currently only we set 'mergeinfo' on subtree only on successful
completion of merge.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 12 13:16:46 2007

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