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

reverse-merge broken?

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2007-10-18 15:15:36 CEST

Is this wrong? Or have I just somehow forgotten how reverse merges
should work?

% svn merge some://url/to/some/branch
(changes happen)
% svn ci -m"check the merge in"
(some changes get committed)
% svn up
At revision 17.
% svn merge -c-17
--- Reverse-merging r17 into '.':
(but nothing else!)
% svn stat

Shouldn't that merge command undo the changes that went into revision
17, leaving me with local mods (matching what I had back at r16,
before the merge and commit)?

I'm looking at a private build of r27129. (OS X, if you want to
care). The repository was created, and has only been touched by,
this same build (it's a tiny demo repo I set up for, well, a demo --
just contains the greek tree).

Happy to provide a detailed reproduction script, dump of the
repository at the outset, and all that, but thought I'd confirm that
my head's on straight first.

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 Thu Oct 18 15:15:55 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.