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

Subversion 1.4 book chapter Common Use Cases of merging

From: Cristi Voica <cvoica_at_gmail.com>
Date: Mon, 25 Aug 2008 18:36:45 +0200

Hello there,

  I might have a problem of understanding who's who in your
explanation about merging a branch into another but also I'm starting
to think that the things in the book are not very clear(at least to
  I'm reading for the past 2 days this part
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html and
it is not crystal clear.

It is stated that "To express only the changes that happened on your
branch, you need to compare the initial state of your branch to its
final state."
I have a development branch in my project(which is like trunk here)
and also I have a new branch for every bug, a copy of this development
branch(which is the same like is your example as far as I see it). So
I have a revision number when I copied my branch(in the example from
the book this is 341) and I also have some revision number after some
commits to my branch.
Here starts my lack of understanding. The book said:

 "Using svn log on your branch, you can see that your branch was
created in revision 341." - this is crystal clear
 "And the final state of your branch is simply a matter of using the
HEAD revision. That means you want to compare revisions 341 and HEAD
of your branch directory, and apply those differences to a working
copy of the trunk." - this is too obscure for me because in the
example below, with the complete merging procedure we use the 405,
which seems to be the revision of my local working copy of the
development branch(in example the fully updated /calc/branch).

What I fail to understand here: how do I use the latest(HEAD) revision
of my branch when I actually use the current revision of the dev

I believe that I understood the need of the "initial state of the
branch to the HEAD of the branch" modification to be compared and
applied to the local copy of the dev. But then:
1. Why do you use in your example 405, which is not head of the branch
I was doing my commits? Actually here it is the big doubt:what is
calc/trunk: the local copy of the branch or dev?
$ cd calc/trunk
$ svn update
At revision 405.
And we use this 405? I see it as a dev revision but it should not...

2. Why this number does not even show up in the "svn log
--stop-on-copy" example"?

I guess it is a reason for all that and I'm so curious to find it out.

Thank you for this excellent book! Keep up the good work!


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-26 05:34:59 CEST

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

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