Re: New branch [was Re: RFC: MI output during program execution]

[Daniel Jacobowitz <drow@false.org>]

On Fri, May 12, 2006 at 08:36:44PM +1200, Nick Roberts wrote:
> I've used ChangeLog for changes on the branch because I thought it would
> make commits easier (certainly from Emacs) but maybe that wasn't so clever
> as merges might be harder.

Right on both counts :-)

> I've called it 6.4.50.20060512-nickrob-async.  I took the date from the one
> I was given but because we're ahead of the rest of the world here in NZ, I
> had already used 20060513 for the branch name.  Perhaps I should change it to
> 6.4.50.20060513-nickrob-async to be consistent?

Don't worry about it too much.

> Actually thats quite a lot of data and probably not of general interest.  Shall
> I just post the ChangeLog?

I suppose; I can always grab the branch and diff it myself.

>  > > 7) Do regular merges with trunk:
>  > > 
>  > >    cvs update -j HEAD  (?)
>  > 
>  > Well, it's more complicated than this.  You need tags at mergepoints -
>  > see the last bit of the chapter which mentions cvs up -j. It's a bit of
>  > a pain.
> 
> I can't get my head round mergepoints (what happens if someone elso commit
> after your tag but before your commit?) but I'll worry about that later.

The trick is that you do everything relative to the tags, including
merges and other tags - nothing relative to HEAD.

  - Create new tag
  - Merge changes from last tag to new tag to branch.


-- 
Daniel Jacobowitz
CodeSourcery