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

[Aaron Bentley]

William Dode wrote:
> address@hidden (James Blackwell) writes:
>
>
> > In lists.arch.users, you wrote:
> >
> > > Hi,
> > >
> > > I begin with arch and really like the idea of decentralized
> > > developpement...
> > >
> > > What is the good way to merge two branchs without and before merging to
> > > the main branch ?
> > >
> > > I've branch MAIN and two forks : B1 and B2.
> > > I would like to incorporate somes patchs of B1 in B2
> > >
> > > When B1 and B2 finish their works i whant to merge them in the MAIN
> > > branch.
> >
> > $ tla get project--main  mymain
> > $ cd mymain
> > $ tla star-merge project--b1--1.1
> > [ make sure everything is kosher]
> > $ tla commit -L"Merged in work from B1"
> >
> > $ tla star-merge project--b2--1.1
> > [ make sure everything is kosher]
> > $ tla commit -L"Merged in work from B2"
>
>
> 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.

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.