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

Re: reverse-merge broken?

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2007-10-19 00:52:23 CEST

On Oct 18, 2007, at 4:35 PM, Kamesh Jayachandran wrote:

> Jack,
>
> Do you have any mergeinfo on a target from the corresponding merge
> source?

Yes:
> svn plist -vR .
Properties on '.':
   svn:mergeinfo : /branches/B1:4-16
/trunk:3-7
Properties on 'greek':
   svn:mergeinfo :
Properties on 'greek/iota':
   svn:mergeinfo : /branches/B1/greek/iota:4-16
/trunk/greek/iota:6-7

I merged from branch B1 to (a working copy on) trunk, committed,
updated, then attempted to reverse that very merge.

> Then only the 'avoid repeat reverse merge code kicks in' and hence
> no reverse merge.
>
> Probably we may need '--merge-insensitive' or '-G' to support
> repeat reverse merge.

I do not think we need any flags to mean "do the right thing" in this
case. There is no conceivable other meaning to

   svn merge -c-17

than "undo rev 17."

On Oct 18, 2007, at 4:54 PM, Mark Phippard wrote:
> Since a reverse merge is always going to be an explicit user
> operation, maybe we ought to just not try to avoid repeat reverse
> merges? The user has already signified they want to reverse the
> merge, so why not just try to do it? What is the scenario where this
> is going to lead to incorrect behavior?

Yes, that would be more reasonable than the present behavior.

Better than both might be:
1. look at the svn:mergeinfo for the revision in the -c-XX flag
2. find which revisions were added to the branch history by that
revision
3. look in the svn:mergeinfo for the current version
4. if the revisions added in #2 are still present, remove them;
otherwise print/return a warning that the named change set is not in
this revision, so it can't be removed

-==-
Jack Repenning
Chief Technology Officer
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
office: +1 650.228.2562
mobile: +1 408.835.8090
raindance: +1 877.326.2337, x844.7461
aim: jackrepenning
skype: jrepenning

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 19 00:54:00 2007

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