Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #62283

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

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Wed, 2018-10-03 at 23:08 +0100, Ben Hutchings wrote:
[...]
> Currently we merge between the sid and master branches, but the
> corresponding upstream branches are not (and should not be) merged.  We
> may need to implement a custom merge strategy to make this work.  It
> sems that git-debrebase does not (yet) deal well with merges; see the
> description of the "--experimntal-merge-resolution" option in its
> manual page.
[...]

git-debrebase(5) goes into more detail about this.  Basically it
doesn't work after any merge commit where the new tree is not identical
to one of the parents.  So a merge from master to sid would be OK (the
result should match master even if it's not fast-forward) but a merge
in the other direction would not.  But worse than that, a non-fast-
forward merge from a remote tracking branch to the corresponding local
branch would also break it.

So I can't see how git-debrebase is usable for team-maintained packages
yet.  A "git pull" that merges is not safe, and a "git pull" that
rebases is also not safe because you must use "git debrebase" for all
rebases.

I thought I was told that team maintenance should be OK.  Did I
misunderstand?  Am I missing something?

Ben.

-- 
Ben Hutchings
Sturgeon's Law: Ninety percent of everything is crap.

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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