Overview
Artifact ID: | a6dd0964cde7c5a07044d6d21dc532dd5c9cdcfc |
---|---|
Ticket: | ee9243c5c77572b490093937c3b0d8041c9a60f4
fossil update -n clutters checkout on failed merge |
User & Date: | martin.weber 2011-08-26 14:50:33 |
Changes
- comment changed to:
(as reported by Marty Backe) <blockquote> 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). </blockquote> 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.
- foundin changed to: "1.18"
- private_contact changed to: "d38fef6d436c103985ac22b73ebb173fb648156c"
- severity changed to: "Minor"
- status changed to: "Open"
- title changed to: "fossil update -n clutters checkout on failed merge"
- type changed to: "Code_Defect"