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


From: Artis Caune <ac-lists_at_latnet.lv>
Date: 2004-04-22 14:04:52 CEST

In chapter 04, "Branching and Merging"

> Aha! Since all branch-changes that happened between
> revisions 341 and 405 were previously merged to the trunk, you
> now know that you want to merge only the branch changes after
> that: revisions 406 through HEAD.

Maybe there should be note, that we should use 'svn update' to
*also* get revision of HEAD and then use that number in log message,
or someone will make log message like this:
"Merged my-calc-branch changes r341:HEAD into the trunk."

# svn diff
Index: ch04.xml
--- ch04.xml (revision 9455)
+++ ch04.xml (working copy)
@@ -932,7 +932,7 @@
  $ svn update
  At revision 480.

-$ svn merge -r 406:480
+$ svn merge -r 406:HEAD
  U integer.c
  U button.c
  U Makefile

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 22 14:05:14 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.