Re: Minor off-by-one in the Book (merging -r406:HEAD should be r405:HEAD)

Nathan Sharp wrote:
> Unless I've gone completely bonkers I believe I've found an off-by-one
> in the book. In the chapter on branching and merging (4), it talks
> about how to merge a branch that already had been merged. It has you
> look up your previous merge in the log file and see that you did
> r341:405. Then, it says you should therefore do r406:HEAD to get the
> rest of the branch. This will, however, leave out any changes made in
> version 406 itself. The correct thing to use would be r405:HEAD.

You are right that any changes made in r406 will not be included in the second merge, but in this particular example r406 was the merge of branch changes into the trunk, so r406 did not make any changes to the branch itself, so it is perfectly OK.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 22 23:20:54 2004