[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: a poll for Dgit workflows



Daniel Stender writes ("a poll for Dgit workflows"):
> I've experimented with applying `gbp import-orig` on an extra
> upstream branch and merging into e.g. dgit/sid, but this seems to be
> substandard because `dgit quilt-fixup` wants to quiltify all the
> changes in the working tree, which isn't wanted.

FYI I am (still) working on support in dgit for pushing from a
patches-unapplied git branch, which might be helpful.

Another easy approach is to switch to a non-quilt source format.  This
will work if you don't need the other things that `3.0 (quilt)' does.

> The next thing which would be interesting is how to rework patches
> e.g. unfuzzing them (for rebase isn't possible on freshly cloned
> repos with no previous Git history?).

It's quite easy with git to rebase a series of commits onto another
branch with disjoint hitory.  (And if the other history has the right
files in it, it will actually work.)  See git-rebase(1), specifically
--onto.

Ian.


Reply to: