Merging stable-2.0 into master

Merging stable-2.0 into master

[Mark H Weaver]

Hello all,

I've started the process of merging stable-2.0 into master.  It's an
unusually large merge (50 commits, since July 28), and I found 'git
merge' too overwhelming to deal with in one piece, so for now I've been
applying one commit at a time, adapting them as needed with frequent
runs of 'make check'.  So far I've worked through 31 out of 50.

My question is: after I've finished adapting and applying all of the
commits, is it okay to simply push them to master?  Or is it worthwhile
to instead do the following?

 1. Save a copy of the files that changed from adapting and applying
    all of the commits from stable-2.0.
 2. git reset --hard origin/master
 3. git merge origin/stable-2.0
    (making sure that nothing new has been pushed to stable-2.0)
 4. Compare the auto-merged files with the copies from step 1.
 5. Use the copies from step 1 to resolve merge conflicts.
 6. Commit the merge

I guess it's a question of how we want the commit history to look,
and how it will affect future merges.

What do you think?

      Mark

Re: Merging stable-2.0 into master

[nalaginrut]

For cautious, anyone tried if 'master' could be compiled/run
successfully?

On Tue, 2012-10-30 at 16:21 -0400, Mark H Weaver wrote:
> Hello all,
> 
> I've started the process of merging stable-2.0 into master.  It's an
> unusually large merge (50 commits, since July 28), and I found 'git
> merge' too overwhelming to deal with in one piece, so for now I've been
> applying one commit at a time, adapting them as needed with frequent
> runs of 'make check'.  So far I've worked through 31 out of 50.
> 
> My question is: after I've finished adapting and applying all of the
> commits, is it okay to simply push them to master?  Or is it worthwhile
> to instead do the following?
> 
>  1. Save a copy of the files that changed from adapting and applying
>     all of the commits from stable-2.0.
>  2. git reset --hard origin/master
>  3. git merge origin/stable-2.0
>     (making sure that nothing new has been pushed to stable-2.0)
>  4. Compare the auto-merged files with the copies from step 1.
>  5. Use the copies from step 1 to resolve merge conflicts.
>  6. Commit the merge
> 
> I guess it's a question of how we want the commit history to look,
> and how it will affect future merges.
> 
> What do you think?
> 
>       Mark
> 

Re: Merging stable-2.0 into master

[Mark H Weaver]

I went ahead and pushed a proper merge of stable-2.0 into master.

     Mark

Re: Merging stable-2.0 into master

[Ludovic Courtès]

Hi,

Mark H Weaver <mhw@netris.org> skribis:

> I went ahead and pushed a proper merge of stable-2.0 into master.

Great, thanks!  Which method did you use?

Ludo’.

Re: Merging stable-2.0 into master

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:
> Mark H Weaver <mhw@netris.org> skribis:
>
>> I went ahead and pushed a proper merge of stable-2.0 into master.
>
> Great, thanks!  Which method did you use?

I used the more elaborate method described in my earlier email, so the
git history looks like the merges that wingo has been doing.  In other
words, I pushed only one new commit to the master branch, namely the one
produced by "git merge origin/stable-2.0".  However, to resolve the
merge conflicts I simply copied the files from the end result of my
earlier one-commit-at-a-time approach.

I saved a copy of the stable-2.0 patches adapted to master (as output by
"git format-patch") which produce precisely the same result as my merge
commit.  If you like, I can make them available.

    Mark

Re: Merging stable-2.0 into master

[Ludovic Courtès]

Hi Mark,

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>> Mark H Weaver <mhw@netris.org> skribis:
>>
>>> I went ahead and pushed a proper merge of stable-2.0 into master.
>>
>> Great, thanks!  Which method did you use?
>
> I used the more elaborate method described in my earlier email, so the
> git history looks like the merges that wingo has been doing.  In other
> words, I pushed only one new commit to the master branch, namely the one
> produced by "git merge origin/stable-2.0".  However, to resolve the
> merge conflicts I simply copied the files from the end result of my
> earlier one-commit-at-a-time approach.

Wow, great.  Thanks for taking the time!

> I saved a copy of the stable-2.0 patches adapted to master (as output by
> "git format-patch") which produce precisely the same result as my merge
> commit.  If you like, I can make them available.

Hopefully we won’t need them.

It’s quite green at <http://hydra.nixos.org/jobset/gnu/guile-master> so
presumably things went well.

Ludo’.