probably auto-resolving of conflicts does not work sometimes?

[John Arbash Meinel]

Alexander Belchenko wrote:
> More info.
> 
> I did another merge in the same branch, but with different
> source branch. Now I have 5 conflicts. Eventually
> I'm again have conflict in first file -- this file is
> changelog file. This file contains russian text
> formatted as ReStructuredText with history of my project
> releases.
> 
> The same again: when I edit manually my russian file then
> auto-resolve does not work.
> So I did resolve this file explicitly.
> 
> Then I edit next file. This file is ascii-only C-source.
> And this file auto-resolved OK.
> 
> I guess auto-resolve does not like either russian or ReStructuredText.
> I mean something like title markup with equal signs:
> 
> История вносимых изменений
> ==========================


I would guess it is just ReStructuredText.

I believe auto-resolve looks for
<<<<<<<<
========
>>>>>>>>

And if any of those are present at the beginning of lines, it doesn't
consider the file auto resolved.

I suppose we could lessen that to just <<<<<< and >>>>>> or make it only
match ones that are exactly the right length. (so it would match exactly
7 '=' characters, but not 6 or 8).

I don't want to lessen it too much, though. Since you can always specify

bzr resolve --all
or bzr resolve filename

to force bzr to believe it is resolved.

John
=:->