Artifact
de378f3c3ef596b1710561b6635853f2bef1ce1f:
Ticket change
[de378f3c3e]
- Ticket [74413366fe5067b3|74413366fe] <i>Bad behaviour merging with renames</i> status still Fixed with 1 other change
by
anonymous
2011-01-04 14:40:04.
D 2011-01-04T14:40:04
J +comment \n\n<hr\s/><i>anonymous\sclaiming\sto\sbe\sviric\sadded\son\s2011-01-04\s14:40:04\sUTC:</i><br\s/>\nAfter\sseeing\sthe\schange\sin\s[ff2a87103b],\swe\ssee\sa\ssituation\swhere\sthe\sonlyDirect\saffects.\sI\sdon't\sknow\sif\sit\sis\sa\sbig\strouble\sor\sif\sthe\ssituation\scan\sbe\simproved.\r\n\r\nConsider\sthis\sgraph:\r\n\r\n<verbatim>\r\n[V]_\r\n\s|\s\s\\\r\n\s|\s\s_[M]\r\n\s|\s/\s\s|\r\n[P]\s\s\s|\r\n\s|\s\s_[rename]\r\n\s|\s/\s\s\s\r\n[\s]\r\n</verbatim>\r\n\r\nWith\sthe\slong\strip\s(directOnly),\sthe\smerge\sfrom\sM\sto\sV\slooks\slike\sa\sRENAME.\sWith\sthe\sshort\strip,\sit\slooks\slike\sADDED/DELETE.\r\n\r\nWhat\sdo\syou\sthink?
K 74413366fe5067b3de2ee80567f15d432c7ea58d
U anonymous
Z d6ba243cd017c895cbc73f46f120eba8