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

Problem with --reintegrate, subversion 1.5

From: CB <cbne_at_gmavt.net>
Date: Thu, 31 Jul 2008 12:59:08 -0400


I have tried to follow the guide in the Subversion book for creating a
branch, updating from trunk, and reintegrating the branch to the

Unfortunately, I keep getting this error when trying to reintegrate:
> svn merge --reintegrate <URL>/Test2/branches/work
svn: Cannot reintegrate from '<URL>/Test2/branches/work' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
This occurs after exactly one change to one file in branches/work. No
file renames or moves.
I used "svn copy" to create the branch named "work", changed one file
in work, commited, then tried to run the "merge --reintegrate".

What am I doing wrong?
Thanks for any advice...

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-31 18:59:32 CEST

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.