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

Re: [Issue 2734] [merge-tracking] Use local merge info to prevent repeated sub-tree merges

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-03-23 21:09:41 CET

On Fri, 23 Mar 2007, pburba@tigris.org wrote:

> http://subversion.tigris.org/issues/show_bug.cgi?id=2734
>
>
>
> User pburba changed the following:
>
> What |Old value |New value
> ================================================================================
> Status|NEW |RESOLVED
> --------------------------------------------------------------------------------
> Resolution| |FIXED
> --------------------------------------------------------------------------------
>
>
>
>
> ------- Additional comments from pburba@tigris.org Fri Mar 23 12:48:45 -0700 2007 -------
> Note, this bit from above is wrong:
>
> > Note that once mergeinfo eliding is implemented, then there won't be *any*
> > properties on 'A\B_COPY\E' because in this case since the mergeinfo created on
> > 'A\B_COPY\E' would be a subset of the rev range already set on its ancestor
> > 'A\B_COPY'.
>
> Merge info should only elide when it has an ancestor with *identical* merge
> info, not a subset since that subset could exist because merges were reversed.
>
> Anyhow, this issue was fixed in r23851 on the merge tracking branch.

Woot!

  • application/pgp-signature attachment: stored
Received on Fri Mar 23 21:14:23 2007

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