Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 4676:b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 06 Jun 2019 17:37:42 +0800 |
| parents | 96ce1030d2fb |
| children | b2de5825e5ca |
comparison
equal
deleted
inserted
replaced
| 4669:daab6d665687 | 4676:b6c819facbe8 |
|---|---|
| 126 $ hg evolve --update | 126 $ hg evolve --update |
| 127 move:[4] babar count up to fifteen | 127 move:[4] babar count up to fifteen |
| 128 atop:[5] babar count up to ten | 128 atop:[5] babar count up to ten |
| 129 merging babar | 129 merging babar |
| 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') | 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
| 131 fix conflicts and see `hg help evolve.interrupted` | 131 unresolved merge conflicts |
| 132 (see 'hg help evolve.interrupted') | |
| 132 [1] | 133 [1] |
| 133 $ hg resolve -l | 134 $ hg resolve -l |
| 134 U babar | 135 U babar |
| 135 $ hg log -G | 136 $ hg log -G |
| 136 @ changeset: 5:e04690b09bc6 | 137 @ changeset: 5:e04690b09bc6 |
| 218 atop:[7] babar count up to ten | 219 atop:[7] babar count up to ten |
| 219 merging babar | 220 merging babar |
| 220 output file babar appears unchanged | 221 output file babar appears unchanged |
| 221 was merge successful (yn)? n | 222 was merge successful (yn)? n |
| 222 merging babar failed! | 223 merging babar failed! |
| 223 fix conflicts and see `hg help evolve.interrupted` | 224 unresolved merge conflicts |
| 225 (see 'hg help evolve.interrupted') | |
| 224 [1] | 226 [1] |
| 225 $ hg resolve -l | 227 $ hg resolve -l |
| 226 U babar | 228 U babar |
| 227 $ hg log -G | 229 $ hg log -G |
| 228 @ changeset: 7:b20d08eea373 | 230 @ changeset: 7:b20d08eea373 |