in the test repository here:
https://chiselapp.com/user/johnfound/repository/bad_update_test/timeline
It contains only one file A.txt. Two branches, containing the test
ground - trunk and Br2, and the branch BadMergeResults that contains
the conflicting files after the last merge attempt.
Regards
, it continues to consider [0a5a95eb] as
nearest common ancestor.
IMHO, that is why it fails to merge properly. On the other hand, when I
browse the file history,
the graph is correct:
https://chiselapp.com/user/johnfound/repository/bad_update_test/finfo?name=A.txt
It means fossil knows the history
, when
I browse the file history,
the graph is correct:
https://chiselapp.com/user/johnfound/repository/bad_update_test/finfo?name=A.txt
It means fossil knows the history of the file and still consider
nearest common
ancestor to be the wrong file.
...or I still can't understand something? So
3 matches
Mail list logo