Re: Rebasing published software and avoid git revert/merge

2012-09-06 Thread Daniel Hartwig
On 5 September 2012 17:53, Axel Beckert wrote: >> I wish to make stable-0.6 the new master while avoiding a merge or >> revert+merge on master (the difference between them is quite large). > > I'd have expected a merge as I think the CLI fixups in 0.6.9 (which > are IIRC the main changes in 0.6.9)

Re: [Aptitude-devel] Rebasing published software and avoid git revert/merge

2012-09-05 Thread Russ Allbery
Axel Beckert writes: > Daniel Hartwig wrote: >> For historical reasons, aptitude is a non-native package. We have a >> combined gbp and upstream setup at the moment: >> >> - master (“upstream” development) >> - upstream (merged from master via git-import-orig) > "merged" not in the sense of me

Re: [Aptitude-devel] Rebasing published software and avoid git revert/merge

2012-09-05 Thread Thomas Goirand
On 09/05/2012 04:16 PM, Daniel Hartwig wrote: > On 5 September 2012 15:48, Thomas Goirand wrote: >> I never understood why everyone insist in using the default name "master". >> This doesn't express anything at all. Instead, you should be using: >> >> - wheezy >> - sid >> - experimental > > Right

Re: [Aptitude-devel] Rebasing published software and avoid git revert/merge

2012-09-05 Thread Axel Beckert
Hi, I'm lagging a little bit behind this thread, but I didn't want to discard my previous mail of which most were written earlier this morning. Daniel Hartwig wrote: > On 5 September 2012 15:48, Thomas Goirand wrote: > > I never understood why everyone insist in using the default name "master".

Re: [Aptitude-devel] Rebasing published software and avoid git revert/merge

2012-09-05 Thread Axel Beckert
Hi, Daniel Hartwig wrote: > Two months ago I release aptitude 0.6.9 to experimental. Many of > those changes will not make it in to Wheezy and I am refactoring and > publishing some of the updates under 0.6.8.n. This refactoring is > proving to be a better base of development going forward so I

Re: [Aptitude-devel] Rebasing published software and avoid git revert/merge

2012-09-05 Thread Daniel Hartwig
On 5 September 2012 15:48, Thomas Goirand wrote: > I never understood why everyone insist in using the default name "master". > This doesn't express anything at all. Instead, you should be using: > > - wheezy > - sid > - experimental Right. That has been a sort of long-term goal ;-) For histori

Re: Rebasing published software and avoid git revert/merge

2012-09-05 Thread Thomas Goirand
On 09/05/2012 03:14 PM, Daniel Hartwig wrote: > On 5 September 2012 14:55, Florian Schlichting > wrote: > >> Have you considered keeping branch names as they are, and setting >> git-debian-branch (and git-upstream-branch) in debian/gbp.conf / >> .gbp.conf? >> > Yes, but master will never b

Re: Rebasing published software and avoid git revert/merge

2012-09-05 Thread Florian Schlichting
On Wed, Sep 05, 2012 at 03:14:23PM +0800, Daniel Hartwig wrote: > On 5 September 2012 14:55, Florian Schlichting > wrote: > > Alternatively, you could revert the entirety of A..master and then > > cherry-pick (or rebase, or merge) A..stable-0.6 onto that and call it > > master. That way, you prese

Re: Rebasing published software and avoid git revert/merge

2012-09-05 Thread Daniel Hartwig
On 5 September 2012 14:55, Florian Schlichting wrote: > Have you considered keeping branch names as they are, and setting > git-debian-branch (and git-upstream-branch) in debian/gbp.conf / > .gbp.conf? Yes, but master will never be used again so I'd rather not leave it around. Also then the alte

Re: Rebasing published software and avoid git revert/merge

2012-09-04 Thread Florian Schlichting
Hi Daniel, > C'--E stable-0.6 (0.6.8.1, unstable/testing) > / > A---B---C---D master (0.6.9.1, experimental) > > I wish to make stable-0.6 the new master while avoiding a merge or > revert+merge on master (the difference between them is quite large). [...] > I realise that deleting master a

Rebasing published software and avoid git revert/merge

2012-09-04 Thread Daniel Hartwig
Hello mentors Two months ago I release aptitude 0.6.9 to experimental. Many of those changes will not make it in to Wheezy and I am refactoring and publishing some of the updates under 0.6.8.n. This refactoring is proving to be a better base of development going forward so I plan to forget about