Overview
Artifact ID: | 5e0ca28d45071c799970deeca2fc346c5ce10c02 |
---|---|
Ticket: | 554f44ee74e3d3b9b24edd358f2bc3d8284f9ce5
Interbranch interference with merges and renames |
User & Date: | viriketo 2011-06-14 15:17:02 |
Changes
- Appended to comment:
<hr /><i>viriketo added on 2011-06-14 15:17:02 UTC:</i><br /> Notice in 'tmp.fossil' how I created a branch named "branch". This has a rename from 'a' to 'b', and is never merged *into* trunk. While working on the "branch2", and updating branch2 from trunk, the file 'a' gets deleted when running: "fossil merge trunk".
- resolution changed to: "Open"