Ticket UUID: | 7326efdc56644af3ea859e98b822c169e69c9092 | ||
Title: | Misleading summary of merge troubles at the end of merge | ||
Status: | Closed | Type: | Code_Defect |
Severity: | Priority: | ||
Subsystem: | Resolution: | Duplicate | |
Last Modified: | 2011-05-21 22:20:19 | ||
Version Found In: | [047e06193b] 2011-04-13 | ||
Description & Comments: | |||
After doing a branch merge, I noticed the output has been:
$ fossil merge trunk WARNING - no common ancestor: drivers/a.cpp WARNING - no common ancestor: drivers/b.cpp WARNING - no common ancestor: drivers/c.cpp WARNING - no common ancestor: drivers/d.cpp WARNING - no common ancestor: drivers/e.cpp WARNING - no common ancestor: drivers/f.cpp WARNING - no common ancestor: drivers/g.cpp WARNING - no common ancestor: drivers/h.cpp ADDED cmake/FindXXX.cmake .... many ADDED/UPDATE "fossil undo" is available to undo changes to the working checkout. fos $ I thought that on merge troubles, 'fossil merge' was giving a warning about the troubles at the end of the merge, but in this case it did not. Shouldn't it give a warning, as when there are other conflicts? Thank you. |