Re: [Gnu-arch-users] Re: merge between two branchs

[William Dode]

Stig Brautaset <address@hidden> writes:

> On Apr 23 2004, Aaron wrote:
>> >But before merging the MAIN branch, i want to share somes patchs between
>> >B1 and B2. For example B1 add a file and B2 want to works on this
>> >file. But i don't want to touch the MAIN branch for this (B2 doesn't
>> >whant all the patchs from B2 for now).
>> >
>> >If there is no arch command for this i can put the patch i want by hand,
>> >but i have somes stranges conflicts.
>> >
>> >For example B1 add a line in a file and B2 add the _same line_ to the
>> >_same file_. When i star-merge from MAIN the file get two times the
>> >line (of course...).
>> 
>> replay --skip-present may do the trick for you.  If you merge B1 into 
>> MAIN, then replay --skip-present B2, it will skip all the patches in B2 
>> that contain patchlogs from B1.
>
> You may want to follow that with a 'sync-tree B2' to merge in the
> patchlogs for the changesets --skip-present skipped. star-merge should
> work again after that.

Thanks, i'll try theses things and read again the documentation, i see that
somes things are not very clear for me...
GnuArch seems so powerfull after cvs that we want imediatly to do crazy
things !

Is the tutorial of regexps.com uptodate ?

-- 
William Dodé - http://flibuste.net