Bug in documentation or in Subverison 1.5?
From: Sohail Somani <sohail_at_taggedtype.net>
Date: Sun, 6 Jan 2008 19:54:08 +0000 (UTC)
Hi,
I was just reading through the updated documentation for the new merge
In the chapter on merging (http://tinyurl.com/3ay7b3), the documentation
"When merging your branch back to the trunk, however, the underlying
I hope Subversion isn't actually using latest trunk with latest branch
Now when I svn switch to trunk and execute svn merge --reintegrate ...,
svn merge $URL/trunk:HEAD $URL/branch:HEAD
Which is equivalent to:
svn merge $URL/trunk_at_N-1 $URL/branch/@N
However, if someone checks into trunk just before you execute the
svn merge $URL/trunk_at_N+1 $URL/branch/@N
I'm hoping what the documentation actually meant to say is that svn merge
-- Sohail Somani http://uint32t.blogspot.com --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org For additional commands, e-mail: users-help_at_subversion.tigris.orgReceived on 2008-01-06 21:12:17 CET |
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.