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

Re: svn commit: r25068 - in trunk/subversion: libsvn_client libsvn_fs_util libsvn_subr tests/libsvn_subr

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-05-23 19:03:03 CEST

On Tue, 22 May 2007, Paul Burba wrote:

> Dan,
>
> As mentioned in IRC I added a new merge test in r25101 that tests some
> practical applications of this fix, most importantly merging to a path
> then reversing that merge to a subtree of the path:
>
> svn merge -rX:Y URL/SOURCE PATH
> svn merge -rY:X URL/SOURCE/CHILD PATH/CHILD
>
> PATH/CHILD should end up with mergeinfo for SOURCE/CHILD with an empty
> rev range, overriding the merge info on PATH.
>
> Trunk currently sets no mergeinfo on PATH/CHILD. Attached is a patch
> which fixes this.
...

Paul mentioned on IRC that he found a better approach to this, and is
working on another patch.

  • application/pgp-signature attachment: stored
Received on Wed May 23 19:03:20 2007

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