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

Re: Trouble using Svn merge --reintegrate

From: John Peacock <john.peacock_at_havurah-software.org>
Date: Mon, 15 Sep 2008 19:30:32 -0400

Murli Varadachari wrote:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.

That error is telling you that something on trunk hasn't been merged to the
branch yet, so you can't use reintegrate. Merge from trunk to branch, then
branch to trunk with --reintegrate and you should be golden.



To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-16 01:31:00 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.