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

Re: Converting to dgit

Hello Nikolaus,

On Tue, Jan 03, 2017 at 10:29:49AM -0800, Nikolaus Rath wrote:
> On Jan 03 2017, Sean Whitton <spwhitton@spwhitton.name> wrote:
> > You mentioned previously that you're trying to use the
> > dgit-maint-merge(7) workflow.  In that case, why do you want git-dpm?
> I don't. I was just trying to get a better overall
> understanding. However, the part about stitching in existing dgit
> history seemed relevant even when not using git-dpm - did I misunderstand?

`dgit push` will force you to do any stitching that you haven't already
done (by telling you to pass --overwrite).  So it's not really something
you have to think too much about.

On Tue, Jan 03, 2017 at 10:36:22AM -0800, Nikolaus Rath wrote:
> I still haven't really made up my mind if I want to use git-maint-merge
> or git-dpm. Russ recently raised a valid point with the Debian
> modifications over-time becoming all tangled up and impossible to
> separate.

I also read Russ's e-mail, but I'm not yet convinced that powerful tools
like `git diff` and `git log` won't be able to give you the information
you need pretty quickly.  It might take a little time to craft the right
command, but that is easily outweighed by the time saved curating a
patch series.

Sean Whitton

Attachment: signature.asc
Description: PGP signature

Reply to: