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

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

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2004-05-22 23:19:04 CEST

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

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

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