merge marker problem

[Stefan Metzmacher]

Stefan (metze) Metzmacher schrieb:
> Hi *,
> 
> when files doesn't end with '\n'
> the cnflict markers, are a bit strange
> 
> metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt
> File1:
> 
> text1
> text2
> text3
> <<<<<<< TREE
> text4
> text8
> text10=======
> text4
> text5
> text6
> text7
> text9>>>>>>> MERGE-SOURCE

ok, I have resolved the conflict and commited the merge to foo.metze
then I have done a bzr push ../foo.dev/ (that worked without problems:-)

when I now do a bzr changeset -r 7 (7 is the commit of the merge or also the pull in the foo.dev branch)

in both branches I'm getting this wraning:
bzr: WARNING: Rev id {metze at samba.org-20050914090948-0d863232f4f727b2} parent
{metze at samba.org-20050914084454-00b6449d315e9c57} missing sha hash.

why?

metze at routox:/home/Projects/SCM/test-bzr/foo.metze> bzr changeset -r 7
# Bazaar-NG changeset v0.0.5
#
# committer: Stefan Metzmacher <metze at samba.org>
# date: Wed 2005-09-14 11:09:48.494373083 +0200
# message:
#    merge in ../foo.dev
#
#

*** modified file file1.txt // text-id:file1.txt-20050914090948-74e04bd5a38e40ad
--- orig/file1.txt
+++ mod/file1.txt
@@ -4,5 +4,9 @@
 text2
 text3
 text4
+text5
+text6
+text7
 text8
-text10
\ No newline at end of file
+text9
+text10

# revision: metze at samba.org-20050914090948-0d863232f4f727b2
#    sha1: 9656ec37e3bfcf480047b3332e60677d6bf5ddab
#    inventory sha1: e075b6c602008f554fd0a9c9ec820c3871f12463
#    parents:
#       metze at samba.org-20050914084421-74dfaea0667d827d a7c15680e60cc51a482df804ee877260d4f842ae
bzr: WARNING: Rev id {metze at samba.org-20050914090948-0d863232f4f727b2} parent
{metze at samba.org-20050914084454-00b6449d315e9c57} missing sha hash.
#       metze at samba.org-20050914084454-00b6449d315e9c57 6fb392a1da2b94024b82cacc08cb8592b6758bab