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

Groups > linux.debian.kernel > #62370

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

Show all headers | View raw

Bastian Blank writes ("Re: Testing git-debrebase/dgit in the linux git repo"):
> 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

Wait, I looked at this again and I think I have misunderstood what you
tried.

Something like what you describe above might well work.  I cloned the
tree you mention and its master (80203aaf59da3b0c) looks in a
reasonable shape.  My git-debrebase is entirely happy with it.  But,
the merge you made looks like a psuedomerge because it is entirely
identical to onen of its parents.  So it's not a merge test case.
Also your `New upstream version 2.02.177' is some kind of tarball
import.  Is it not maintained in git upstream ?

I'm also confused about whether you are saying that the master branch
in that repo is the result, or the starting point, for the commands
you quote above.  If it is the result then I am confused because I see
no commit corresponding to new-upstream 2.02.179.

I can't repro what you did because I don't seem to be able to get the
right bits.  In particular, the tags like 2.02.177 are only available
from upstream or something ?  Your Vcs-Git header does not work for
me:
  zealot:lvm2-gitdebrebase-test> git-fetch -v vcs-git
  Username for 'https://gitlab.com':
?

Feel free to grab me on irc if that seems like it will work better...

Ian.

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