subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Xavier Noria <...@hashref.com>
Subject Re: weird merge
Date Thu, 25 Mar 2010 16:11:14 GMT
On Thu, Mar 25, 2010 at 4:51 PM, Tyler Roscoe <tyler@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?

Mime
View raw message