Mercurial > evolve

changeset 6366:0a806b7dded3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: switch to double//slash branch in ...-content-divergent-discard.t
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 22 Dec 2022 16:53:26 +0400
parents ca9753176053
children 3202da474a30
files tests/test-evolve-public-content-divergent-discard.t
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-discard.t	Fri Nov 18 16:50:44 2022 +0400
+++ b/tests/test-evolve-public-content-divergent-discard.t	Thu Dec 22 16:53:26 2022 +0400
@@ -649,8 +649,8 @@
   $ hg amend
   $ hg up -r "desc('added c')"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg branch feature
-  marked working directory as branch feature
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ echo dada > d
   $ hg ci -Am "added d"
@@ -665,13 +665,13 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 (make other divergent a closed branch head)
-  $ hg ci --amend -m "closing feature branch" --close-branch
+  $ hg ci --amend -m "closing branch double//slash" --close-branch
 
   $ hg glog
-  @  6:af442315d198 closing feature branch
+  @  6:83825baa0dc2 closing branch double//slash
   |   draft content-divergent
   |
-  | o  5:497d0d2b90ba added d
+  | o  5:8b3ac33245dd added d
   |/    public
   |
   o  2:155349b645be added c
@@ -688,10 +688,10 @@
 
   $ hg evolve --content-divergent
   merge:[5] added d
-  with: [6] closing feature branch
+  with: [6] closing branch double//slash
   base: [3] added d
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198
-  content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198
-  working directory is now at 497d0d2b90ba
+  other divergent changeset 83825baa0dc2 is a closed branch head and differs from local 8b3ac33245dd by "branch, description" only, discarding 83825baa0dc2
+  content divergence resolution between 8b3ac33245dd (public) and 83825baa0dc2 has same content as 8b3ac33245dd, discarding 83825baa0dc2
+  working directory is now at 8b3ac33245dd