Colin Watson writes ("Bug#928473: dgit: not clear what to do when earlier
uploads used dgit but intermediate ones didn't"):
> On Sun, May 05, 2019 at 08:31:14PM +0100, Ian Jackson wrote:
> > --overwrite is intended for this situation. The documentation talking
> > about "NMU changes" is speaking loosely, and should mention "changes
> > in uploads which weren't done with git" too.
> >
> > It will make a pseudomerge of the synthetic import. Is that a problem
> > for you ?
>
> I'd been hoping to avoid the pseudomerge and have the histories be
> exactly identical, but I probably shouldn't be too precious about that,
> and you make a good point about allowing people with existing dgit
> clones to fast-forward.
Other than in split-brain quilt modes (which don't apply in this
case), the pseudomerge will appears on the branch you run `dgit push'
from. So the histories will be identical because the pseudomerge will
be in your master. Is that a problem ? I thought I should mention
it...
> That makes sense now, and I agree. FWIW, I found the documentation
> reasonably clear as far as it went, but the things I was missing were:
>
> * an explicit indication about --deliberately-not-fast-forward being
> non-fast-forwarding either from a synthetic local import or from the
> dgit server history;
>
> * an indication of which camp this particular situation falls into of
> the two options that are presented in various places and why, that
> is, the situation of a gap between two dgit pushes in which non-dgit
> uploads had happened.
...
> (A side note while I'm looking at this anyway: the use of "rewind" as a
> synonym for "non-fast-forwarding", while somewhat common in git
> terminology, is unfortunate. The terms seem to be borrowed from video
> playback systems, where "rewind" is often just the exact opposite of
> "fast-forward", and so when I see "rewinding history" in a few places in
> dgit(1) my initial interpretation is that it must mean "updating a ref
> to point to an ancestor of the commit that it previously pointed to",
> whereas I think dgit(1) means "any push that isn't a fast-forward". I
> don't know if I'm the only one for whom it has that connotation.)
Thanks. That's three useful suggestions for improvement.
Regards,
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
