Comment 5 for bug 403137

2009/7/23 Ted Gould <email address hidden>:
> On Wed, 2009-07-22 at 17:59 +0000, John A Meinel wrote:
>> Anyway, we could certainly do better about merging .bzrignore in a
>> *logical* fashion, rather than a *textual* fashion. But that doesn't
>> mean that real-world *logical* changes can't conflict.
>
> Sure, I guess that I'm arguing that in the case of where I've used "bzr
> ignore" to add entries to the end it should work.  In cases where I've
> gone and hand modified the file things are different.  I'd guess, for
> most users, the use the built in command more than they edit the file.

It'd probably be reasonable to say this should run a file-specific
merge hook that, if lines are just added in both sides, with no
deletions, just takes both of them. This would handle Ted's case.
You could possibly still generate cases by hand where it gives silly
results, but it's also possible for people to review the diff and
correct it.

--
Martin <http://launchpad.net/~mbp/>