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

RE: Unexpected result attempting to merge from trunk to branch

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 12 Nov 2008 15:16:41 -0500

Are you using svn 1.5 on the server and client? Were you using svn 1.5
when you made this branch?

BOb

-----Original Message-----
From: Rush Manbert [mailto:rush_at_manbert.com]
Sent: Wednesday, November 12, 2008 2:29 PM
To: subversion
Subject: Unexpected result attempting to merge from trunk to branch

I made a development branch a while ago. The copy that created it was
revision 1523 in my repository.

I tried to sync it with the trunk as described in the Red Book:
          svn merge URL_for_trunk
issued in the top level directory of a working copy of my branch. (I
copied the entire trunk to create the branch).

I made sure there were no changes in my working copy.

The merge says that it is merging revisions 2 through 1643 (current
HEAD) into the working copy. This is obviously incorrect, since the
branch was created at revision 1523.

Does it appear that I have done something wrong?

- Rush

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-12 21:17:04 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.