[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Getting rid of the msvc branch (was: Re: Removing 'scriptversion' from o
From: |
Peter Rosin |
Subject: |
Getting rid of the msvc branch (was: Re: Removing 'scriptversion' from our scripts) |
Date: |
Wed, 07 Mar 2012 16:00:14 +0100 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 |
Peter Rosin skrev 2012-03-07 14:08:
> Do you think it would be at all possible to start with a msvc and maint
> that is freshly merged into both master and branch-1.11. Then merge msvc
> into maint in such a way that maint resembles branch-1.11, then do dummy
> merges of maint into master and branch-1.11. I.e. for the master case:
> git checkout master; git merge --strategy=ours maint
> and similar for branch-1.11. And then, finally, get rid of the obnoxious
> msvc branch...
>
> After that, we should be able to go back to the old simple rule of only
> updating the scripts on maint.
I tried, and it looks good, methinks.
I did this:
git checkout maint
git merge --no-ff msvc
git diff maint branch-1.11 HACKING | patch -p1
git diff maint branch-1.11 lib/Automake/ChannelDefs.pm | patch -p1
git diff maint branch-1.11 tests/ar-lib3.test | patch -p1
git diff maint branch-1.11 tests/ar-lib4.test | patch -p1
git diff maint branch-1.11 tests/extra-portability.test | patch -p1
git diff maint branch-1.11 tests/extra-portability2.test | patch -p1
git diff maint branch-1.11 tests/extradep.test | patch -p1
git diff maint branch-1.11 tests/extradep2.test | patch -p1
git diff maint branch-1.11 tests/list-of-tests.mk | patch -p1
git add HACKING
git add lib/Automake/ChannelDefs.pm
git add tests/ar-lib3.test
git add tests/ar-lib4.test
git add tests/extra-portability.test
git add tests/extra-portability2.test
git add tests/extradep.test
git add tests/extradep2.test
git add tests/list-of-tests.mk
git commit --amend -C HEAD
git checkout branch-1.11
git merge --strategy=ours maint
git checkout master
git merge --strategy=ours maint
I think I'd like to push that. Ok?
Cheers,
Peter
- [PATCH] add xlc support to depcomp, Michael, 2012/03/03
- Re: [PATCH] add xlc support to depcomp, Stefano Lattarini, 2012/03/03
- Re: [PATCH] add xlc support to depcomp, Michael, 2012/03/05
- Re: [PATCH] add xlc support to depcomp, Stefano Lattarini, 2012/03/05
- Re: [PATCH] add xlc support to depcomp, Michael, 2012/03/06
- Re: [PATCH] add xlc support to depcomp, Stefano Lattarini, 2012/03/06
- Message not available
- Message not available
- Message not available
- Message not available
- Removing 'scriptversion' from our scripts (was: Re: [PATCH] add xlc support to depcomp), Stefano Lattarini, 2012/03/06
- Re: Removing 'scriptversion' from our scripts, Peter Rosin, 2012/03/06
- Re: Removing 'scriptversion' from our scripts, Stefano Lattarini, 2012/03/07
- Re: Removing 'scriptversion' from our scripts, Peter Rosin, 2012/03/07
- Getting rid of the msvc branch (was: Re: Removing 'scriptversion' from our scripts),
Peter Rosin <=
- Re: Getting rid of the msvc branch, Stefano Lattarini, 2012/03/07
- Re: Getting rid of the msvc branch, Peter Rosin, 2012/03/07
- Re: Getting rid of the msvc branch, Peter Rosin, 2012/03/07
- Re: Getting rid of the msvc branch, Stefano Lattarini, 2012/03/07
- Re: Getting rid of the msvc branch, Peter Rosin, 2012/03/07
- Re: Getting rid of the msvc branch, Stefano Lattarini, 2012/03/07
- Re: Getting rid of the msvc branch, Peter Rosin, 2012/03/08
- Re: Getting rid of the msvc branch, Stefano Lattarini, 2012/03/09
- Re: Getting rid of the msvc branch, Peter Rosin, 2012/03/09