Overview
Artifact ID: | 646e9326c84a5daa9c4fced3b279eefee106bcf6 |
---|---|
Ticket: | 7326efdc56644af3ea859e98b822c169e69c9092
Misleading summary of merge troubles at the end of merge |
User & Date: | viriketo 2011-05-02 08:34:46 |
Changes
- comment changed to:
After doing a branch merge, I noticed the output has been: <verbatim> $ 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 $ </verbatim> 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.
- foundin changed to: "[047e06193b] 2011-04-13"
- status changed to: "Open"
- title changed to:
Misleading summary of merge troubles at the end of merge
- type changed to: "Code_Defect"