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

Re: Converting to dgit

On Jan 03 2017, Sean Whitton <spwhitton@spwhitton.name> wrote:
> 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.

Can you give an example? Eg if I have to Debian patched that both
produced merge conflicts at some point, how do I disentangle them into
two separate patches with just git log and git diff?

> It might take a little time to craft the right
> command, but that is easily outweighed by the time saved curating a
> patch series.

Well - that is obviously very much dependent on the git-fu of the person
doing the work.


GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F

             »Time flies like an arrow, fruit flies like a Banana.«

Reply to: