Re: Stacked GIT 0.3 (now more Quilt-like)

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Jul 4, 2005, 06:27 UTC
Message-ID: <46a038f9050703232719a05c9e@mail.gmail.com>
In-Reply-To: <1120425269.6845.28.camel@localhost.localdomain>

Show 12 quoted lines

> > 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:

wiggle is good but it's not safe. You should definitely review the results of a wiggle merge with extra care. It sometimes does magic and merges the unmergeable, and sometimes it does bad, bad things.

cheers,

martin