Fossil SCM

'merge --backout' does not handle conflicts properly

Closed

c26c63eb1b36b9e… · opened 15 years, 2 months ago

Type
Code_Defect
Priority
Severity
Resolution
Unable_To_Reproduce
Subsystem
Created
Feb. 10, 2011 11:36 a.m.

I had some checkin (A) that introduced a bad change.

Then trying to fix it, I made a new checkin (B) with some changes in the lines introduced in (A).

When I saw that the change B was not improving the situation... I decided to run "fossil merge --backout A". It took away all the lines introduced by A, but it did not say anything, that the lines in the working directory were not exactly those introduced by A.

Shouldn't it say, that the change A cannot be backed out directly, as it has conflicts introduced by B?

Comments (1)

system 2 years, 2 months ago

Closing as part of periodic cleanup.

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button