control: tag -1 + patch Hello,
On Tue 04 Mar 2025 at 11:58am GMT, Ian Jackson wrote: > Package: dgit > Version: 12.6 > Severity: normal > File: /usr/bin/dgit > > I was asked in pers.comm about rebasing a branch from dgit clone, as > part of the dgit-nmu-simple workflow. > > Our current comments about rebasing are a bit elliptical; dealing > simultaneously with detailed situtations, but also doing so vaguely. > > I think we ought to state more directly the basic principles. > Something like this: > > You can treat the dgit/sid branch you end up on as a normal local > git branch tracking an upstream branch. So you can rebase your local > changes that you haven't pushed anywhere, as normal. > > The one thing that's weird is the quilt fixup commits (that turn up > if you do eg dgit sbuild), and the thing you need to know is that if > it's OK for you to be rebasing them at all, you can and should just > dreop them. > > All of this follows from an underlying fact, which is that dgit > doesn't have any magic state somewhere. So if you rebase away the > quilt fixup, and rework your branch, the result must be fine because > it looks *just like* it would do if you'd just made those commits > straight off. (NB git-debrebase *does* have weird off-branch state.) LGTM. -- Sean Whitton
signature.asc
Description: PGP signature
