On Aug 12, 2015 1:19 AM, "Stephan Beal" <sgb...@googlemail.com> wrote: > > On Wed, Aug 12, 2015 at 10:13 AM, Jacek Cała <jacek.c...@gmail.com> wrote: >> >> Thanks for the suggestion... no luck in finding '<<<<<'. It matches only _FOSSIL_ and a few binary files. It could be the line endings because I work primarily on Windows and whenever fossil complains about CR/LF I just ignore it (saying 'a' during the commit). >> >> However, I guess, there is no way to list files that were reported as conflicting during merge, is there? > > > Not that i am aware of.
If there really are conflicts, [fossil changes] should report them. Also, fiddling with your diff command might be illustrative, example: [fossil set diff-command "diff -bu"] for producing unified diff that ignores whitespace, and "diff -u" for acknowledging whitespace... > i know svn requires one to manually tell it "the conflict for this specific file is resolved," but fossil does not do so, and it does not remember that a file is conflicted. When a conflict occurs, the conflicting part(s) of the file will be wrapped up in blocks which look like this (copy/pasted from a recent mail by Richard): > > <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< > ======= COMMON ANCESTOR content follows ============================ > ======= MERGED IN content follows ================================== > >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > > If you don't see any of those in your source-controlled files then fossil does not know about a conflict. If it reports a conflict and yet does not tag it with such a block, then something is wrong (in fossil), but we are not currently aware of any such bugs. > > -- > ----- stephan beal > http://wanderinghorse.net/home/stephan/ > http://gplus.to/sgbeal > "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
