Mercurial > evolve
comparison tests/test-evolve-abort-orphan.t @ 6396:e5bd76f95145 mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 06 Feb 2023 21:38:31 +0400 |
| parents | 34f5c849fc1d 1328195f76a9 |
| children | 270223576b7f 43a2a333e343 |
comparison
equal
deleted
inserted
replaced
| 6350:0aff320554d2 | 6396:e5bd76f95145 |
|---|---|
| 153 $ hg resolve -m | 153 $ hg resolve -m |
| 154 (no more unresolved files) | 154 (no more unresolved files) |
| 155 continue: hg evolve --continue | 155 continue: hg evolve --continue |
| 156 $ hg evolve --continue | 156 $ hg evolve --continue |
| 157 evolving 4:c41c793e0ef1 "added d" | 157 evolving 4:c41c793e0ef1 "added d" |
| 158 working directory is now at e83de241f751 | 158 working directory is now at 69c43da639bb |
| 159 | 159 |
| 160 $ hg up .^^^ | 160 $ hg up .^^^ |
| 161 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 161 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 162 | 162 |
| 163 When there are evolved revisions but on a single branch | 163 When there are evolved revisions but on a single branch |
| 199 $ hg glog | 199 $ hg glog |
| 200 @ 8:0c41ec482070 added b | 200 @ 8:0c41ec482070 added b |
| 201 | () draft | 201 | () draft |
| 202 o 7:125af0ed8cae added a | 202 o 7:125af0ed8cae added a |
| 203 | () draft | 203 | () draft |
| 204 | * 6:e83de241f751 added d | 204 | * 6:69c43da639bb added d |
| 205 | | () draft orphan | 205 | | () draft orphan |
| 206 | % 5:e93a9161a274 added c | 206 | % 5:e93a9161a274 added c |
| 207 | | () draft orphan | 207 | | () draft orphan |
| 208 | x 2:b1661037fa25 added b | 208 | x 2:b1661037fa25 added b |
| 209 | | () draft | 209 | | () draft |
| 218 working directory is now at 125af0ed8cae | 218 working directory is now at 125af0ed8cae |
| 219 | 219 |
| 220 $ hg glog | 220 $ hg glog |
| 221 @ 7:125af0ed8cae added a | 221 @ 7:125af0ed8cae added a |
| 222 | () draft | 222 | () draft |
| 223 | * 6:e83de241f751 added d | 223 | * 6:69c43da639bb added d |
| 224 | | () draft orphan | 224 | | () draft orphan |
| 225 | * 5:e93a9161a274 added c | 225 | * 5:e93a9161a274 added c |
| 226 | | () draft orphan | 226 | | () draft orphan |
| 227 | * 2:b1661037fa25 added b | 227 | * 2:b1661037fa25 added b |
| 228 | | () draft orphan | 228 | | () draft orphan |