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

Re: weird merge

From: Xavier Noria <fxn_at_hashref.com>
Date: Thu, 25 Mar 2010 17:11:14 +0100

On Thu, Mar 25, 2010 at 4:51 PM, Tyler Roscoe <tyler_at_cryptio.net> wrote:

> You should look at your branch's ancestry to make sure those revisions
> are not needed. If they're not, you can use a --record-only merge to
> make the branch think it has those revisions. Subsequent merges from
> trunk should then skip over those revisions and merge only what you
> want.

I see.

Could you help with the command that is needed here? Never did that before.

Is there something we can do in trunk so that subsequent new branches
do not need to do the same?
Received on 2010-03-25 17:12:02 CET

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