I made some more tests. Located the check-ins that produced this strange merge and checked out the versions of the problematic file from both check-ins in order to compare them. So, the versions of this file are completely byte-to-byte equal. The only specificity of these files is that the last line ends without CR or LF or any other control character. The last byte in the file is the character "'" - that is the last character on the line.
Best Regards. ---------- Original Message ---------- To: ([email protected]) From: Richard Hipp ([email protected]) Subject: Re: [fossil-users] Strange merge conflicts. Date: 4.3.2011 18:23:12 >On Fri, Mar 4, 2011 at 11:18 AM, John Found <[email protected]> wrote: > >> Several times when making merge with fossil, I ended up with really >> strange conflicts like this: >> >> <<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<< >> include '%TargetOS%/mouse.asm'======= original content above; conflict >> below ============= >> include '%TargetOS%/mouse.asm'>>>>>>> END MERGE CONFLICT: conflict last >> >>>>>>>>>>>>>>>>>> >> > >Did it really come out looking like that, or did the line wrapping occur >when you pasted the output in to your email program? > >Differences might be whitespace. Extra whitespace at the end of the line, >or tabs instead of spaces someplace. > >Or, could it be that your files does not end with a \n and that fact is >confusing Fossil somehow? If so, I'll look into it. But a quick fix for >you is to make sure your source code files end with \n - something you >should probably be doing anyhow. > > > >> >> In one merge, there was 4..5 similar "conflicts" and none of "real" >> In my opinion, both lines are totally equal. >> Is it a bug or I am missing something? >> >> Regards >> http://fresh.flatassembler.net Assembly language visual programming. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
