Re: Testing git-debrebase/dgit in the linux git repo

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Bastian Blank <waldi@debian.org>
Newsgroups	linux.debian.kernel
Subject	Re: Testing git-debrebase/dgit in the linux git repo
Date	Sun, 14 Oct 2018 20:50:01 +0200
Message-ID	<wITCF-5KS-1@gated-at.bofh.it> (permalink)
References	<wEXvb-5LT-15@gated-at.bofh.it> <wEYAV-6mk-7@gated-at.bofh.it> <wF0CJ-7tb-5@gated-at.bofh.it>
X-Mailbox-Line	From debian-kernel-request@lists.debian.org Sun Oct 14 18:42:09 2018
Old-Return-Path	<waldi@debian.org>
X-Amavis-Spam-Status	No, score=-9.28 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_MED=-2.3] autolearn=ham autolearn_force=no
Mail-Followup-To	Ian Jackson <ijackson@chiark.greenend.org.uk>, Debian kernel maintainers <debian-kernel@lists.debian.org>, dgit@packages.debian.org
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Disposition	inline
User-Agent	NeoMutt/20170113 (1.7.2)
X-Mailing-List	<debian-kernel@lists.debian.org> archive/latest/118358
List-ID	<debian-kernel.lists.debian.org>
List-URL	<https://lists.debian.org/debian-kernel/>
List-Archive	https://lists.debian.org/msgid-search/20181014182627.o3lmhgqofrrh3sv6@shell.thinkmo.de
Approved	robomod@news.nic.it
Lines	36
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Cc	Debian kernel maintainers <debian-kernel@lists.debian.org>, dgit@packages.debian.org
X-Original-Date	Sun, 14 Oct 2018 20:26:28 +0200
X-Original-Message-ID	<20181014182627.o3lmhgqofrrh3sv6@shell.thinkmo.de>
X-Original-References	<51934ae1809affb7ff5af12ebb65997f5d87b973.camel@decadent.org.uk> <cbe3498a23ddc4d8639264700165692e929e5af1.camel@decadent.org.uk> <23477.27645.968213.535325@chiark.greenend.org.uk>
Xref	csiph.com linux.debian.kernel:62366

Show key headers only | View raw

Hi Ian

On Thu, Oct 04, 2018 at 02:25:17AM +0100, Ian Jackson wrote:
> How big a problem this is depends how much your team works in
> parallel.

We are using merge requests in gitlab, to review our work.  This means
we have merges all over the place.

I tried using git-debrebase on one of my other packages.  To mimic
merge request I used merges to introduce new upstream versions.  It did
not survive a git debrebase new-upstream, as the resulting tree is not
longer a fast forward to master and it actually removed commits.

See https://salsa.debian.org/waldi/lvm2-gitdebrebase-test/network/master

To get to this state I used the following commands:

% git checkout -b feature/2.02.177 master
% git debrebase new-upstream 2.02.177
% git checkout master
% git merge --no-ff feature/2.02.177
% git checkout -b feature/2.02.179 master
% git debrebase new-upstream 2.02.179

I tried the whole thing a second time, had to "git reset --hard" a few
times, but now git debrebase does not even manage to use
"convert-from-gbp", the patches vanish.  Not sure what this is about.

I'm really missing from the documentation how a git tree using debrebase
should look like, where the merges should be.

Bastian

-- 
She won' go Warp 7, Cap'n!  The batteries are dead!

Thread

Testing git-debrebase/dgit in the linux git repo Ben Hutchings <ben@decadent.org.uk> - 2018-10-04 00:10 +0200
  Re: Testing git-debrebase/dgit in the linux git repo Ben Hutchings <ben@decadent.org.uk> - 2018-10-04 01:20 +0200
    Re: Testing git-debrebase/dgit in the linux git repo Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-10-04 03:30 +0200
      Re: Testing git-debrebase/dgit in the linux git repo Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-10-04 03:40 +0200
      Re: Testing git-debrebase/dgit in the linux git repo Bastian Blank <waldi@debian.org> - 2018-10-14 20:50 +0200
        Re: Testing git-debrebase/dgit in the linux git repo Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-10-14 23:30 +0200
        Re: Testing git-debrebase/dgit in the linux git repo Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-10-15 00:30 +0200
          Re: Testing git-debrebase/dgit in the linux git repo Bastian Blank <waldi@debian.org> - 2018-10-16 21:50 +0200
    Re: Testing git-debrebase/dgit in the linux git repo Sean Whitton <spwhitton@spwhitton.name> - 2018-10-04 17:10 +0200
    Re: Testing git-debrebase/dgit in the linux git repo Bastian Blank <waldi@debian.org> - 2018-10-17 13:00 +0200

csiph-web