View Ticket
Not logged in
Ticket UUID: 24e1e78fa301399e5711c3786594819445694668
Title: Files in conflict are not marked as so
Status: Open Type: Code_Defect
Severity: Important Priority:
Subsystem: Resolution: Open
Last Modified: 2010-10-15 14:03:15
Version Found In: b48f78964e
Description & Comments:
I do a fossil update, and am reported a file is in conflict:

$ fossil up

MERGE hello.txt

***** 1 merge conflicts in hello.txt

but then when I do fossil st:

$ fossil st

...

EDITED hello.txt

If I had a long list of files, I would like to know which ones are in conflict and which not.


anonymous claiming to be Joerg Sonnenberger added on 2010-10-15 14:03:15:
There are two potential questions related to this:

(1) Should fossil always scan for the markers on files with modified mtime. This works for conflicts from manual patches too. It has the strong disadvantage of requiring reading potentially large files to determine the conflict. Such a check should at least be done pre-commit, I think.

(2) Should conflict resolution be implicit or explicit? I'm not a fan of the Mercurial approach of explicit "hg resolve", but it has its merits too. At the very least, it would make the status operation very cheap and force people to more explicit think about it.