Mercurial > evolve
diff tests/test-evolve-abort-orphan.t @ 6401:716912541759 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 07 Feb 2023 10:51:10 +0400 |
| parents | e82ad19eb3cc 270223576b7f |
| children | 567cc86f2d01 64c7715d7d77 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t Fri Dec 09 00:41:21 2022 +0400 +++ b/tests/test-evolve-abort-orphan.t Tue Feb 07 10:51:10 2023 +0400 @@ -141,7 +141,7 @@ continue: hg evolve --continue $ hg evolve --continue evolving 4:c41c793e0ef1 "added d" - working directory is now at e83de241f751 + working directory is now at 69c43da639bb $ hg up .^^^ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -187,7 +187,7 @@ | () draft o 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | * 6:69c43da639bb added d | | () draft orphan | * 5:e93a9161a274 added c | | () draft orphan @@ -206,7 +206,7 @@ $ hg glog @ 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | * 6:69c43da639bb added d | | () draft orphan | * 5:e93a9161a274 added c | | () draft orphan