[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 16:00:12 -0500

Just for giggles, can you run a svn info on your working directory to
verify that it is pointing to the branch folder in the repo.

-----Original Message-----
From: Rush Manbert [mailto:rush_at_manbert.com]
Sent: Wednesday, November 12, 2008 3:48 PM
To: Bob Archer
Cc: subversion
Subject: Re: Unexpected result attempting to merge from trunk to branch

The server machine is running svn 1.5.0. The client is running 1.5.1.

This was the case when I made the branch. I made it using SmartSVN,
but I was running SmartSVN 4 then, which is compatible with the 1.5
version of Subversion.

- Rush

On Nov 12, 2008, at 12:16 PM, Bob Archer wrote:

> 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

---------------------------------------------------------------------
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 22:00:38 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.