Filetype-specific mergers not taken in to account by merge proposals

[James Westby]

Hi,

I realise this isn't going to be the easiest bug to fix.

Bazaar now allows for filetype-specific mergers to be used, which will
change the diff you get when you merge.

Merge proposals show the diff you would get if you merged, but do not
take in to account any specific mergers, meaning the results can be different
from what the user will get.

This could be dismissed, but it would be useful for a project that has its
own mergers for certain file formats to be able to see the actual merge diff they
would get, rather than the one with the default merger.

Thanks,

James

[Tim Penhey (thumper)]

There will need to be some investigation to work out what needs to be done. Do you have any examples?

[James Westby (james-w)]

On Tue, 23 Feb 2010 20:43:35 -0000, Tim Penhey <email address hidden> wrote:
> There will need to be some investigation to work out what needs to be
> done. Do you have any examples?

In general? There is the debian/changelog merger for Ubuntu merge
proposals, and NEWS in bzr itself.

I don't have specific examples to hand right now.

Thanks,

James