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

unable to merge a feature branch back to trunk.

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-12-09 02:27:42 CET

I'm in the process of documenting basic merge tracking in the svnbook,
describing the basic process of managing a long-lived feature branch
and then merging it back to trunk. In the process, I've been
experimenting with (today's) trunk code, testing out the famed
'reflective merge' scenario by hand.

I'm using ra_local. I made a trunk, did some commits. Copied trunk
to branch. Then started making commits on both trunk and branch, back
and forth. As expected, 'svn merge trunkURL' in my branch-wc just did
the right thing. I did a bunch more commits to both trunk and branch,
and once again, 'svn merge trunkURL' did the right thing. (It's really
nice to have repeated branch synchronization so easy!)

What's weird is when I tried to merge the branch back to trunk.
First, I made sure the branch was entirely synchronized with the
trunk. Then I went into my trunk-wc and tried to preview the merge:

$ svn mergeinfo . --from-source
file:///Users/sussman/scratch/repos/branches/mybranch
Path: .

$

Wha? Nothing at all pending? No candidate ranges?

When I did the 'reflective' merge itself, I got nothing as well:

$ svn merge file:///Users/sussman/scratch/repos/branches/mybranch .
--- Merging r19 into '.':
 U .

$ svn diff

Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r16-18
   Merged /branches/mybranch:r19

...this makes no sense to me. The branch's mergeinfo is correct, I
think:

$ svn pl -v mybranch/
Properties on 'mybranch':
  svn:mergeinfo : /trunk:5-18

But I *know* there are a whole bunch of changes on the branch, and it
seems like the reflective merge should be aware of them.

Am I using this feature incorrectly? Are we waiting for Kamesh's
feature to be done? (I thought Kamesh's work was to separate
conflict-fix changes from normal merge changes... and none of my
merges had any conflicts.)

I've attached my dumpfile for reference.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sun Dec 9 02:27:55 2007

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