Mercurial > hg
comparison tests/test-merge-remove.t @ 27599:ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
It makes far more sense to leave these conflicts unresolved and kick back to
the user than to just assume that the local version be chosen. There are almost
certainly buggy scripts and applications using Mercurial in the wild that do
merges or rebases non-interactively, and then assume that if the operation
succeeded there's nothing the user needs to pay attention to.
(This wasn't possible earlier because there was no way to re-resolve
change/delete conflicts -- but now it is.)
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 23 Dec 2015 12:51:45 -0800 |
parents | 27b89a0957ec |
children | 978b907d9b36 |
comparison
equal
deleted
inserted
replaced
27598:97e39f70fb47 | 27599:ad5966de3c9a |
---|---|
101 | 101 |
102 Those who use force will lose | 102 Those who use force will lose |
103 | 103 |
104 $ hg merge -f | 104 $ hg merge -f |
105 remote changed bar which local deleted | 105 remote changed bar which local deleted |
106 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 106 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
107 merging foo1 and foo to foo1 | 107 merging foo1 and foo to foo1 |
108 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 108 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
109 (branch merge, don't forget to commit) | 109 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
110 [1] | |
110 $ cat bar | 111 $ cat bar |
111 bleh | 112 bleh |
112 $ hg st | 113 $ hg st |
113 M bar | 114 M bar |
114 M foo1 | 115 M foo1 |