Sean Whitton writes ("Re: Converting to dgit (was: How to get history into
dgit)"):
> On Mon, Jan 02, 2017 at 07:22:54PM -0800, Nikolaus Rath wrote:
> > I'll have to bring this up one more time. I just read
> > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794244, and that
> > sounds (in "USING GIT-DPM WITH DGIT FOR THE FIRST TIME") as if I should
> > also stitch the existing dgit history into my git repository.
> >
> > Is that information outdated, or should I still do that?
>
> I've never used git-dpm(1), but I would guess that information is out of
> date because it was written before the --quilt=dpm option was added to
> dgit.
Wow, it is very optimistic to describe the manpage skeleton in #794244
as `information'. It's guesses by someone (me) who doesn't know
git-dpm.
Certainly that manpage skeleton ought to have some `--dpm' options
sprinkled over it. And the `git merge -s ours' can be avoided
nowadays by passing dgit `--overwrite' (which does the check mentioned
there too).
I see from another bug that Nikolaus is trying this out. Nikolaus:
please do ask for help if you get trouble, and I'll try to sort you
out. Hopefully when you're done we can construct a useful and
mostly-true workflow guideline manpage!
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.
