#54 ch04: merge example shows wrong revision

[Anonymous]

Originally created by: bala...@gmail.com
Originally owned by: ptbu...@gmail.com

In chapter 4, "Common Use-Cases for Merging", "Merging a Whole Branch to
Another", the second example "For example, suppose you decide to keep
working on your branch for another week, in order to complete an
enhancement to your original feature or bugfix":

The suggested merge command uses 406 as the starting revision for this
second merge.  Unless I'm crazy, I believe that [r405] should be used
as the starting revision for the new merge.  In this particular example, it
make no difference, because we know that the difference between revisions
405 and 406 consist only of the changes from the first merge.  But in
general, when doing a 2nd merge like this, we want to capture all of the
changes made in the branch since the first merge. Since the merge command
is calculating the difference between two revisions, we want to use the
end-revision from the first merge as the start-revision of the second merge.

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Owner: cmpilato

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Labels: Milestone-en-1.6
Owner: pbu...@googlemail.com

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Summary: ch04: merge example shows wrong revision

[Anonymous]

Originally posted by: ptbu...@gmail.com

The example referenced exists only up to the 1.4 version of the book.  In the 1.5+ versions of the book this example is effectively replaced by the Keeping a Branch in Sync section.

[Anonymous]

Originally posted by: cmpilato

Oops.  Use the correct address for Paul Burba.

Owner: ptbu...@gmail.com

[Anonymous]

Originally posted by: cmpilato

So, sounds like this is Fixed as of 1.5.  Closing as such.

Status: Fixed