merge marker problem

[John A Meinel]

Stefan (metze) Metzmacher wrote:
> Hi *,
>
> when files doesn't end with '\n'
> the cnflict markers, are a bit strange

I see your point, but how else are you going to know that there wasn't a
newline at the end of the file. If bzr was to silently include them,
then it is secretly lying to you.

I suppose it could do:
text1
text2
text3
<<<<<<< TREE
text4
text8
text10
======= \no newline
text4
text5
text6
text7
text9
>>>>>>> MERGE-SOURCE \no newline

What does CVS/svn do?

John
=:->

>
> 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
> metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.THIS
> File1:
>
> text1
> text2
> text3
> text4
> text8
> text10metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.OTHER
> File1:
>
> text1
> text2
> text3
> text4
> text5
> text6
> text7
> text9metze at routox:/home/Projects/SCM/test-bzr/foo.metze> cat file1.txt.BASE
> File1:
>
> text1
> text2
> text3
> text4metze at routox:/home/Projects/SCM/test-bzr/foo.metze>
>
> --
> metze
>
> Stefan Metzmacher <metze at samba.org> www.samba.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050914/41b18e60/attachment.pgp