Overview
| Artifact ID: | be2da003f4b7310cbc77d8f0af7addd022c797ca |
|---|---|
| Ticket: | 4df5f38f1e564d2970c269bf5ea1d2aec5173dc9
Troubles merging a file delete with a file change |
| User & Date: | viriketo 2011-08-30 07:58:20 |
Changes
- comment changed to:
I have a branch where I have modified <code>a.cpp</code>. If in trunk someone deleted that file, and I run <code>fossil update trunk</code>, fossil will silently merge the branch modifications and the trunk delete silently into a file delete. Fossil should report this as a conflict.
- foundin changed to: "1.18"
- status changed to: "Open"
- title changed to: "Troubles merging a file delete with a file change"
- type changed to: "Code_Defect"