.hgtimestamp cannot be merged if timestamp of identical file differs on different computers
At the moment tool-merging of the .hgtimestamp file always fails with our projects. I assume that the problem is that some files have identical contents on the different workstations but have different timestamps (either because I or my colleagues have not been using timestampmod right from the start or because someone used "revert"). This means that the corresponding lines (entries) in the .hgtimestamp file remain different because as long as the files' contents do not change, mercury does not commit/push/pull them and then also timestampmod does not change their timestamp. If you change such a file, mercuy tool-merge shows in .hgtimestamp tree different timestamps for the same file. (original on local revison, original on other revision, changed one). I suggest: After the merge check that the timestamps of all files math those in the .hgtimestamp file. Otherwise change them. (Do NOT change .hgtimestamp) The next time (and any time later) it should work fine.