Re: Merging stable-2.0 into master

2012-11-03 Thread Mark H Weaver
l...@gnu.org (Ludovic Courtès) writes: Mark H Weaver m...@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

Re: Merging stable-2.0 into master

2012-11-03 Thread Ludovic Courtès
Hi Mark, Mark H Weaver m...@netris.org skribis: l...@gnu.org (Ludovic Courtès) writes: Mark H Weaver m...@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

Re: Merging stable-2.0 into master

2012-11-02 Thread Ludovic Courtès
Hi, Mark H Weaver m...@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’.

Merging stable-2.0 into master

2012-10-30 Thread 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

Re: Merging stable-2.0 into master

2012-10-30 Thread 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

Re: Merging stable-2.0 into master

2012-10-30 Thread Mark H Weaver
I went ahead and pushed a proper merge of stable-2.0 into master. Mark