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

Re: Why isn't the merge patch being merged?

On Wed, 24 Oct 2007 14:11:40 +0200, Raphael Hertzog <hertzog@debian.org> said: 

> On the other hand, it might be that a 2-way merge is not what we're
> looking for. It's certainly better than nothing but OTOH it would be 2
> times better if we could have 3-way merge so that we can even add a
> new option --force-confmerge that tries automatically a 3-way merge
> and that falls back to the usual behaviour --force-conf{new,old,def}
> if the merge process failed.

> But it requires more extensive changes as we need to keep a copy of
> the conffiles as shippped by the previous version of the package.

        Would the ucf handling of similar issues be of any help? ucf
 offers two way (and optionally 3-way) merges, as well as sdiff

You have a strong appeal for members of the opposite sex.
Manoj Srivastava <srivasta@acm.org> <http://www.golden-gryphon.com/>
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C

Reply to: