Robert Collins robert.collins at canonical.com
Fri May 1 03:03:33 BST 2009

On Thu, 2009-04-30 at 18:49 -0700, Eric Berry wrote:
> The files that got reverted were test files with just a single line in
> them, and there are really only two files in the branch.
> So, any changes to them would be seen as conflicts correct?

Small files will tend to conflict on any change simply because the
change is likely to be adjacent to a region that has altered, so it
looks like a conflict.

1-line files are really pathological :)

If the 2->3 change was 

and a 3->4 change did

Then reversing the 2->3 change tried to do

But there is no B, only C -> conflict.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090501/a6d6dff8/attachment.pgp 

More information about the bazaar mailing list