Ticket UUID: | 554f44ee74e3d3b9b24edd358f2bc3d8284f9ce5 | ||
Title: | Interbranch interference with merges and renames | ||
Status: | Open | Type: | Code_Defect |
Severity: | Priority: | ||
Subsystem: | Resolution: | Open | |
Last Modified: | 2011-10-12 16:23:12 | ||
Version Found In: | [d8221b9863] 2011-05-12 | ||
Description & Comments: | |||
Finally I managed to reproduce the trouble I mentioned in http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg03885.html.
I'll attach a repository. viriketo added on 2011-06-14 15:17:02 UTC: While working on the "branch2", and updating branch2 from trunk, the file 'a' gets deleted when running: "fossil merge trunk". viriketo added on 2011-06-15 07:43:05 UTC: viriketo added on 2011-06-21 08:17:16 UTC: viriketo added on 2011-10-12 16:23:12 UTC: |
Attachments:
- tmp.fossil [download] added by viriketo on 2011-06-14 15:16:02. [details]