Artifact
678e6f49a3682b95a940d753afbd0b8e7b225b07:
Ticket change
[678e6f49a3]
- Ticket [74413366fe]
Bad behaviour merging with renames status still Open with 1 other change
by
anonymous
2011-01-04 11:04:35.
D 2011-01-04T11:04:35
J +comment \n\n<hr\s/><i>anonymous\sclaiming\sto\sbe\sviric\sadded\son\s2011-01-04\s11:04:35\sUTC:</i><br\s/>\nHere\sis\sthe\sscript\sthat\shelps\sreproducing\sthe\sproblem.\sNotice\sthat\sit\sneeds\sfossil\sfixed\sby\sthe\spatch\sI\sproposed\sin\s[c9d454153e],\sotherwise\sit\sfails\sto\sreproduce\sthe\sproblem\s(not\sthat\sit\sworks;\ssimply\sit\smisses\scommits\swhen\smerging):\r\n\r\n<verbatim>\r\nfossil\snew\sa.fossil\r\nmkdir\sa\s\r\ncd\sa\r\nfossil\sopen\s../a.fossil\r\ntouch\sb\r\nfossil\sadd\sb\r\nsleep\s1\r\nfossil\scommit\s-b\sb\s-m\sxxxb\r\nfossil\supdate\strunk\r\ntouch\sa\r\nfossil\sadd\sa\r\nsleep\s1\r\nfossil\scommit\s-m\sxxxa\r\nfossil\smv\sa\sc\r\nmv\sa\sc\r\nsleep\s1\r\nfossil\scommit\s-m\sxxxac\r\nfossil\supdate\sb\r\nfossil\smerge\strunk\r\nsleep\s1\r\nfossil\scommit\s-m\smerge\r\nfossil\supdate\strunk\r\n</verbatim>\r\n\r\nAfter\sthis:\r\n<verbatim>\r\n$\sfossil\smerge\sb\r\nADDED\sb\r\nADDED\sd\r\nDELETE\sc\r\n"fossil\sundo"\sis\savailable\sto\sundo\schanges\sto\sthe\sworking\scheckout.\r\n</verbatim>\r\n\r\nIt\sshould\s*not*\sdelete\sC.\r\n\r\nNotice\sthat\swithout\sthe\spatch\sin\s[c9d454153e],\s<kbd>fossil\smerge</kbd>\sfails\sto\ssee\sthe\srename\sat\sall,\sand\swill\sdo\sthe\smerge\signoring\sthe\scheckin\swith\sthe\srename\sin\strunk.
K 74413366fe5067b3de2ee80567f15d432c7ea58d
U anonymous
Z e716a922d4836bd2d315b44c9fbed010