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

Re: can *never* use merge with --reintegrate

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 12 Oct 2009 13:18:19 -0400

On Sun, Oct 11, 2009 at 9:41 PM, Pat Farrell <pfarrell_at_pfarrell.com> wrote:
> I can't get merge tracking to work. Even if I start with an empty
> branch, just created and a full "svn update" done on the branch, when I
> try the merge command, it fails. Always, with the same message
>
> svn merge --reintegrate  \ https://www.pfarrell.com/repos/bbook/branches/pat
>
> svn: Cannot reintegrate from
> 'https://www.pfarrell.com/repos/bbook/branches/pat' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> The client is svn, version 1.5.4 (r33841)
> the server is svn, version 1.5.1 (r32289)
> and the repository have been updated to 1.5
>
> What am I doing wrong?

You should upgrade your client to 1.5.7. There were improvements made
to reintegrate in both 1.5.5 and 1.5.6. The validity checking that is
blocking you was improved to be more intelligent and when it does
block you from using reintegrate it now gives a more detailed error
message with what you need to look at.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2406736
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 19:19:19 CEST

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