Mercurial > evolve
diff tests/test-push-checkheads-multibranches-E3.t @ 6381:60daa7887c49
branching: merge test changes from before topic namespaces
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 31 Jan 2023 13:33:28 +0400 |
parents | fc60328270ac ebc2dea354a2 |
children | 1328195f76a9 |
line wrap: on
line diff
--- a/tests/test-push-checkheads-multibranches-E3.t Mon Jan 09 19:44:49 2023 +0400 +++ b/tests/test-push-checkheads-multibranches-E3.t Tue Jan 31 13:33:28 2023 +0400 @@ -14,12 +14,12 @@ .. old-state: .. .. * 2-changeset on branch default -.. * 1-changeset on branch Z (between the two other) +.. * 1-changeset on branch double//slash (between the two other) .. .. new-state: .. .. * 2-changeset on branch default, on untouched, the other moved -.. * 1-changeset on branch Z (at the same location) +.. * 1-changeset on branch double//slash (at the same location) .. .. expected-result: .. @@ -48,8 +48,8 @@ updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd client - $ hg branch Z - marked working directory as branch Z + $ hg branch double//slash + marked working directory as branch double//slash (branches are permanent and global, did you want a bookmark?) $ mkcommit B0 $ hg branch default --force @@ -75,9 +75,9 @@ $ hg log -G --hidden @ dc44c53142f0 [default] (draft): C1 | - | x afc55ba2ce61 [default] (draft): C0 + | x c7f1f02ffefc [default] (draft): C0 | | - | o 93e5c1321ece [Z] (draft): B0 + | o 1fd532b11e77 [double//slash] (draft): B0 | | | o 8aaa48160adc [default] (draft): A0 |/