From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sun, 03 Jul 2005 21:14:29 GMT
Subject: Re: Stacked GIT 0.3 (now more Quilt-like)
Message-ID: <1120425269.6845.28.camel@localhost.localdomain>
In-Reply-To: <m3oe9k6p40.fsf@telia.com>

On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:
> Catalin Marinas <catalin.marinas@gmail.com> writes:
> > I know that using -A gives a more detailed output in case of a conflict.
> > The problem is that you will get a conflict even if the changes are
> > identical, making it impossible to detect when a patch was merged
> > upstream.
> 
> OK, I see. How about using wiggle instead?
> 
>         http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/
> 
> That's what patch-utils uses if you run "pushpatch -m". wiggle is also
> a lot smarter than diff3, so there will be fewer cases that result in
> a conflict. Maybe a parameter to "stg push" could enable wiggle mode.

I haven't used wiggle before but I will give it a try (though I prefer
such a tool not to be too smart since it might make mistakes). Anyway, I
will make this configurable, i.e. you could put something like below in
the .stgitrc file:

merger = 'diff3 -m -E %(branch1)s %(ancestor)s %(branch2)s'

or

merger = 'wiggle -m %(branch1)s %(ancestor)s %(branch2)s'

> Is there a way in StGIT to undo a push that results in a large mess of
> conflicts?

Good point. No, there isn't yet. I will think about an undo command. At
the moment, the old top and bottom ids of a patch are saved so that the
patch before the merge can be retrieved but there isn't any command to
make use of them.

--
Catalin