Hi Ben
On Thu, Oct 04, 2018 at 12:15:44AM +0100, Ben Hutchings wrote:
> I thought I was told that team maintenance should be OK. Did I
> misunderstand? Am I missing something?
I played with it a little bit in a smaller context. What I understand
now is that git-debrebase uses the same branch
Hi
On Sun, Oct 14, 2018 at 11:21:36PM +0100, Ian Jackson wrote:
> 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 fol
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 deb
Bastian Blank writes ("Re: Testing git-debrebase/dgit in the linux git repo"):
> We are using merge requests in gitlab, to review our work. This means
> we have merges all over the place.
I think it will be necessary for me to write some kind of script to
convert your
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
Hello Ben,
On Thu 04 Oct 2018 at 12:15AM +0100, Ben Hutchings wrote:
> 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
Ian Jackson writes ("Re: Testing git-debrebase/dgit in the linux git repo"):
> If you want to try this out on some actual existing merges in your
> existing history, you can do it by passing
> --experimental-merge-resolution
> on the command line. If this is successful it
Ben Hutchings writes ("Re: Testing git-debrebase/dgit in the linux git repo"):
> 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
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
As discussed in yesterday's meeting, I've been investigating git-
debrebase and dgit as tools for maintaining the linux source package
with upstream included. It seems like they could make it a lot easier
to add and rebase patches, while maintaining some patch history and
fast-forward branches
10 matches
Mail list logo
