Ticket UUID: | ee9243c5c77572b490093937c3b0d8041c9a60f4 | ||
Title: | fossil update -n clutters checkout on failed merge | ||
Status: | Open | Type: | Code_Defect |
Severity: | Minor | Priority: | |
Subsystem: | Resolution: | ||
Last Modified: | 2011-08-26 14:50:33 | ||
Version Found In: | 1.18 | ||
Description & Comments: | |||
(as reported by Marty Backe)
For files that have a merge conflict, the 'baseline', 'original', and 'merge' files get created on my local file system. All other files that would get updated do not get updated (the expected result with the -n option). Either those files shouldn't be created for -n, or, if they are a necessity, be deleted afterwards. I agree with Marty that the state of the checkout should be the same before and after fossil update -n. |