User: Dave Peterson, mailto:dpeterson@enthought.com
Categories: Daily use
Hello,
I\'m unhappy with your FAQ entry on merging from a
branch to a trunk because it implies that the method described is the
only valid way to work with branch/trunk situations in SVN when that is
not the case. It just appears to be the only way TortoiseSVN *allows*
you to work (which should probably be considered a bug in
TortoiseSVN.)
In particular, I\'m referring to the scenario in the SVN book where it
describes \"Feature Branches\" -- see the following URL:
http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ch-4-sect-4.4.2
This scenario, and the description of the merge command in the SVN
Book, indicate that SVN merge can take two source trees and apply the
differences between them to a third, separate tree. As discussed in
the book, you\'d want to do this if you had a branch that you kept
integrating trunk changes into while you were working on a large
feature. When you finished, if you follow your FAQ description, you\'d
be reapplying changes you synced down from the trunk back to the trunk
and that can cause corruption. What you want to do is compare the head
of your branch to the head of the trunk and promote those changes to
the trunk (as described in the section of the SVN Book.)
But I can\'t seem to get TortoiseSVN\'s merge command to work this way
and your FAQ seems to indicate that you don\'t believe it should. Am I
missing something that would make it work as described in the SVN book?
If so, I think you should update your FAQ entry.
Here is why I\'m saying it doesn\'t work:
When I try the \"Merge...\" menu item by setting the \"From\" to be
URL1@HEAD, and the \"To\" to be URL2@HEAD, the differences found and
applied to my current path are *very* different from what happens if I
pass those same parameters to \'svn merge\' at a command prompt. (It
appears that the changes applied by TortoiseSVN are a superset of all
commits done to both URLs since a common ancestor. In SVN, the changes
only reflect the current differences between the two URLs.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 08:15:38 2005