[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: Murli Varadachari <mvaradachari_at_facebook.com>
Date: Mon, 15 Sep 2008 16:58:27 -0700

On 9/15/08 4:30 PM, "John Peacock" <john.peacock_at_havurah-software.org>
wrote:

> 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.
>
> I merged everything from the trunk to the branch [ as specified by ≥svn log
> ‹stop-on-copy <branch> ≤ ] -- the svn:mergeinfo indicates the correct
> revisions. It would have been nice if there was a ≥-v≤ option to the command ‹
> this message is too cryptic.
>
> Att this point I am reverting to a manual merger ≥svn merge URL:/trunk/www
> URL:/branch/www [trunk-WC]≤ which seems to work.
>
> Hopefully the next branch will turn out ok
>
> HTH
>
> John
>
Received on 2008-09-16 01:59:30 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.