Mercurial > evolve
diff tests/test-single-head-obsolescence-named-branch-A4.t @ 6315:ebc2dea354a2
tests: switch to double//slash branch in many tests
We want to make sure cases with double slash in branch name will continue to be
handled correctly, and for that we need more tests that use unusual branch
names like this.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 30 Oct 2022 15:22:16 +0400 |
parents | 8cc7732a29bf |
children | b1d010b2e6c4 |
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-named-branch-A4.t Thu May 12 20:02:40 2022 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A4.t Sun Oct 30 15:22:16 2022 +0400 @@ -15,11 +15,11 @@ .. old-state: .. .. * 2 changesets on branch default -.. * 2 changesets on branch Z interleaved with the other one +.. * 2 changesets on branch double//slash interleaved with the other one .. .. new-state: .. -.. * 2 changesets on branch Z at the same location +.. * 2 changesets on branch double//slash at the same location .. * 1 changeset on default untouched (the lower one) .. * 1 changeset on default moved on the other one .. @@ -29,11 +29,11 @@ .. .. graph-summary: .. -.. D ● (branch Z) +.. D ● (branch double//slash) .. | .. C ø⇠◔ C' .. | | -.. B ● | (branch Z) +.. B ● | (branch double//slash) .. |/ .. A ● .. | @@ -52,8 +52,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 @@ -61,8 +61,8 @@ $ mkcommit C0 created new head (consider using topic for lightweight branches. See 'hg help topic') - $ hg branch Z --force - marked working directory as branch Z + $ hg branch double//slash --force + marked working directory as branch double//slash $ mkcommit D0 created new head (consider using topic for lightweight branches. See 'hg help topic') @@ -85,11 +85,11 @@ $ hg log -G --hidden @ cfe9ed94fa4a [default] (draft): C1 | - | * 78578c4306ce [Z] (draft): D0 + | * d9a9b6fe977e [double//slash] (draft): D0 | | - | 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 |