Code review comment for lp://staging/~pr0gg3d/loggerhead/annotate_comment_notpresent_812583

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/9/2011 3:08 PM, Francesco Del Degan wrote:
> ya I refactored adding a third argument to 'history' tuple and
> modified the existing test adding two "." as messages and use one ''
> in void-comment test.
>
> Now, i've to do the same mod into the other mp, extending
> "make_annotate_ui_*" and modifying the test for empty file.
>
> I'm sorry, but i'm pretty new to bzr, i'm trying to figure out how
> handle this (sort of) conflict.

I'm not sure how you are defining conflict. However, I would probably
just merge this branch into the other branch, and add the new updates.

Then when proposing it, you can mark that the other branch has a
"prerequisite" branch of this one. So the diff will show just what will
be newly introduced.

I would probably reduce the amount of the test that you copied. You
don't need the "set up by __call__" comment, etc. Just call get_values,
and add a comment that you are testing it handles an empty commit
message without breaking.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5BMvkACgkQJdeBCYSNAAPpRgCdEU727Id3BujMxhuLp9nJbU0c
dSgAn3GmmNaOGADYgCZfDYLl0JjxJcHC
=hcFh
-----END PGP SIGNATURE-----