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

can *never* use merge with --reintegrate

From: Pat Farrell <pfarrell_at_pfarrell.com>
Date: Sun, 11 Oct 2009 21:41:47 -0400

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?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 03:42:41 CEST

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