Mercurial > evolve

changeset 1595:edcd2f0474c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: back hash change from 'extra' content change out The changesets 13701c3fed9c, 3e907ff1981f and 54394d2aaf5e were introduced to handle a change to the way extra were carried out by various command in core. This had to be backout for 3.7.1 as is broken multiple third party extension. We backout the test update as a result. Core changesets performing the backout: ce9696193175::b698abf971e7
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 03 Feb 2016 23:21:50 +0000
parents de43a3e6b358
children 6079dcbfb726
files tests/test-sharing.t tests/test-stabilize-conflict.t tests/test-tutorial.t
diffstat 3 files changed, 94 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-sharing.t	Fri Jan 22 21:41:59 2016 +0900
+++ b/tests/test-sharing.t	Wed Feb 03 23:21:50 2016 +0000
@@ -387,7 +387,7 @@
 
 Figure SG08: review and public changesets after Alice pushes.
   $ hg --hidden -R ../review shortlog -G -r 1::
-  o  7:754cbfea9b13  public  fix bug 15 (v2)
+  o  7:a06ec1bf97bd  public  fix bug 15 (v2)
   |
   o  6:540ba8f317e6  public  implement feature X (v3)
   |
@@ -402,7 +402,7 @@
   @  1:de6151c48e1c  public  fix bug 37
   |
   $ hg --hidden -R ../public shortlog -G -r 1::
-  o  3:754cbfea9b13  public  fix bug 15 (v2)
+  o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
   o  2:540ba8f317e6  public  implement feature X (v3)
   |
@@ -431,7 +431,7 @@
   $ echo 'pretty good fix' >> file1
   $ hg commit -u bob -m 'fix bug 24 (v1)'
   $ hg shortlog -r .
-  4:6d407e4bc7f4  draft  fix bug 24 (v1)
+  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
 
 Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft
 changeset and amends it herself. ::
@@ -454,13 +454,13 @@
   $ echo 'better fix (bob)' >> file1
   $ hg amend -u bob -m 'fix bug 24 (v2 by bob)'
   $ hg --hidden shortlog -G -r 3::
-  @  6:059a6be5b63a  draft  fix bug 24 (v2 by bob)
+  @  6:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |
-  | x  5:a2493482aafe  draft  temporary amend commit for 6d407e4bc7f4
+  | x  5:3466c7f5a149  draft  temporary amend commit for 2fe6c4bd32d0
   | |
-  | x  4:6d407e4bc7f4  draft  fix bug 24 (v1)
+  | x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
   |/
-  o  3:754cbfea9b13  public  fix bug 15 (v2)
+  o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
 
 Bob discovers the divergence.
@@ -477,19 +477,19 @@
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
-  o  7:cdcc922d8d15  draft  fix bug 24 (v2 by alice)
+  o  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   |
-  | @  6:059a6be5b63a  draft  fix bug 24 (v2 by bob)
+  | @  6:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |/
-  | x  5:a2493482aafe  draft  temporary amend commit for 6d407e4bc7f4
+  | x  5:3466c7f5a149  draft  temporary amend commit for 2fe6c4bd32d0
   | |
-  | x  4:6d407e4bc7f4  draft  fix bug 24 (v1)
+  | x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
   |/
-  o  3:754cbfea9b13  public  fix bug 15 (v2)
+  o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
-  $ hg --hidden shortlog -r 'successors(6d407)'
-  6:059a6be5b63a  draft  fix bug 24 (v2 by bob)
-  7:cdcc922d8d15  draft  fix bug 24 (v2 by alice)
+  $ hg --hidden shortlog -r 'successors(2fe6)'
+  6:a360947f6faf  draft  fix bug 24 (v2 by bob)
+  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
 Use evolve to fix the divergence.
   $ HGMERGE=internal:other hg evolve --divergent
@@ -497,28 +497,28 @@
   with: [7] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 70e807c6e67f
+  working directory is now at 5ad6037c046c
   $ hg log -q -r 'divergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::
-  @  9:70e807c6e67f  draft  fix bug 24 (v2 by bob)
+  @  9:5ad6037c046c  draft  fix bug 24 (v2 by bob)
   |
-  | x  8:d8d2e15ab73d  draft  temporary amend commit for 059a6be5b63a
+  | x  8:bcfc9a755ac3  draft  temporary amend commit for a360947f6faf
   | |
-  +---x  7:cdcc922d8d15  draft  fix bug 24 (v2 by alice)
+  +---x  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   | |
-  | x  6:059a6be5b63a  draft  fix bug 24 (v2 by bob)
+  | x  6:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |/
-  | x  5:a2493482aafe  draft  temporary amend commit for 6d407e4bc7f4
+  | x  5:3466c7f5a149  draft  temporary amend commit for 2fe6c4bd32d0
   | |
-  | x  4:6d407e4bc7f4  draft  fix bug 24 (v1)
+  | x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
   |/
-  o  3:754cbfea9b13  public  fix bug 15 (v2)
+  o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
   $ hg --hidden shortlog -r 'precursors(9)'
-  6:059a6be5b63a  draft  fix bug 24 (v2 by bob)
-  7:cdcc922d8d15  draft  fix bug 24 (v2 by alice)
+  6:a360947f6faf  draft  fix bug 24 (v2 by bob)
+  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   $ cat file1
   Do stuff.
   pretty good fix
--- a/tests/test-stabilize-conflict.t	Fri Jan 22 21:41:59 2016 +0900
+++ b/tests/test-stabilize-conflict.t	Wed Feb 03 23:21:50 2016 +0000
@@ -169,7 +169,7 @@
   grafting 5:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   8:7f3d9db50b5d
+  @  changeset:   8:1836b91c6c1d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -232,7 +232,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | o  changeset:   8:7f3d9db50b5d
+  | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
--- a/tests/test-tutorial.t	Fri Jan 22 21:41:59 2016 +0900
+++ b/tests/test-tutorial.t	Wed Feb 03 23:21:50 2016 +0000
@@ -251,7 +251,7 @@
 My local work is now rebased on the remote one.
 
   $ hg log -G
-  @  f49d36e87e8a (draft): adding fruit
+  @  41aff6a42b75 (draft): adding fruit
   |
   o  dfd3a2d7691e (draft): adding condiment
   |
@@ -273,9 +273,9 @@
   > EOF
   $ hg ci -m 'transport'
   $ hg log -G
-  @  207804be803b (draft): transport
+  @  1125e39fbf21 (draft): transport
   |
-  o  f49d36e87e8a (draft): adding fruit
+  o  41aff6a42b75 (draft): adding fruit
   |
   o  dfd3a2d7691e (draft): adding condiment
   |
@@ -289,13 +289,13 @@
 
   $ hg prune . # "." is for working directory parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory now at f49d36e87e8a
+  working directory now at 41aff6a42b75
   1 changesets pruned
 
 The silly changeset is gone.
 
   $ hg log -G
-  @  f49d36e87e8a (draft): adding fruit
+  @  41aff6a42b75 (draft): adding fruit
   |
   o  dfd3a2d7691e (draft): adding condiment
   |
@@ -323,11 +323,11 @@
   $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping
   $ hg ci -m 'SPAM SPAM'
   $ hg log -G
-  @  0a0104b5de2f (draft): SPAM SPAM
+  @  fac207dec9f5 (draft): SPAM SPAM
   |
-  o  0dbf8779b56f (draft): bathroom stuff
+  o  10b8aeaa8cc8 (draft): bathroom stuff
   |
-  o  f49d36e87e8a (draft): adding fruit
+  o  41aff6a42b75 (draft): adding fruit
   |
   o  dfd3a2d7691e (draft): adding condiment
   |
@@ -346,18 +346,18 @@
 
 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
 
-  $ hg up 'p1(0dbf8779b56f)' # going on "bathroom stuff" parent
+  $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg grab 0a0104b5de2f # moving "SPAM SPAM" to the working directory parent
-  rebasing 10:0a0104b5de2f "SPAM SPAM" (tip)
+  $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
+  rebasing 10:fac207dec9f5 "SPAM SPAM" (tip)
   merging shopping
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg log -G
-  @  21ddb8bb7ace (draft): SPAM SPAM
+  @  a224f2a4fb9f (draft): SPAM SPAM
   |
-  | o  0dbf8779b56f (draft): bathroom stuff
+  | o  10b8aeaa8cc8 (draft): bathroom stuff
   |/
-  o  f49d36e87e8a (draft): adding fruit
+  o  41aff6a42b75 (draft): adding fruit
   |
   o  dfd3a2d7691e (draft): adding condiment
   |
@@ -377,8 +377,8 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 21ddb8bb7acea9d1c46bf8a3965590c595aecb99
-  # Parent  f49d36e87e8ac78cba19b4aa94421cf13c18bcb5
+  # Node ID a224f2a4fb9f9f828f608959912229d7b38b26de
+  # Parent  41aff6a42b7578ec7ec3cb2041633f1ca43cca96
   SPAM SPAM
   
   diff --git a/shopping b/shopping
@@ -394,7 +394,7 @@
 To make sure I do not push unready changeset by mistake I set the "bathroom
 stuff" changeset in the secret phase.
 
-  $ hg phase --force --secret 0dbf8779b56f
+  $ hg phase --force --secret 10b8aeaa8cc8
 
 we can now push our change:
 
@@ -409,17 +409,17 @@
 
 for simplicity sake we get the bathroom change in line again
 
-  $ hg grab 0dbf8779b56f
-  rebasing 9:0dbf8779b56f "bathroom stuff"
+  $ hg grab 10b8aeaa8cc8
+  rebasing 9:10b8aeaa8cc8 "bathroom stuff"
   merging shopping
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg phase --draft .
   $ hg log -G
-  @  1820dfc355a0 (draft): bathroom stuff
+  @  75954b8cd933 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -528,11 +528,11 @@
   1 new obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  1820dfc355a0 (public): bathroom stuff
+  o  75954b8cd933 (public): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -550,9 +550,9 @@
   $ hg rollback
   repository tip rolled back to revision 4 (undo pull)
   $ hg log -G
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -585,11 +585,11 @@
   1 new obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  1820dfc355a0 (draft): bathroom stuff
+  o  75954b8cd933 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -603,7 +603,7 @@
 
 Remotely someone add a new changeset on top of the mutable "bathroom" on.
 
-  $ hg up 1820dfc355a0 -q
+  $ hg up 75954b8cd933 -q
   $ cat >> shopping << EOF
   > Giraffe
   > Rhino
@@ -615,15 +615,15 @@
 But at the same time, locally, this same "bathroom changeset" was updated.
 
   $ cd ../local
-  $ hg up 1820dfc355a0 -q
+  $ hg up 75954b8cd933 -q
   $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
   $ hg commit --amend
   $ hg log -G
-  @  adef71cd3160 (draft): bathroom stuff
+  @  a44c85f957d3 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -650,15 +650,15 @@
 see both version showing up in the log.
 
   $ hg log -G
-  o  f9d416ff3ea5 (draft): animals
+  o  bf1b0d202029 (draft): animals
   |
-  | @  adef71cd3160 (draft): bathroom stuff
+  | @  a44c85f957d3 (draft): bathroom stuff
   | |
-  x |  1820dfc355a0 (draft): bathroom stuff
+  x |  75954b8cd933 (draft): bathroom stuff
   |/
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -678,7 +678,7 @@
   $ hg push other
   pushing to $TESTTMP/other (glob)
   searching for changes
-  abort: push includes unstable changeset: f9d416ff3ea5!
+  abort: push includes unstable changeset: bf1b0d202029!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
  
@@ -693,7 +693,7 @@
   $ hg evolve --dry-run
   move:[15] animals
   atop:[14] bathroom stuff
-  hg rebase -r f9d416ff3ea5 -d adef71cd3160
+  hg rebase -r bf1b0d202029 -d a44c85f957d3
 
 Let's do it
 
@@ -701,18 +701,18 @@
   move:[15] animals
   atop:[14] bathroom stuff
   merging shopping
-  working directory is now at 0325a6c93ec2
+  working directory is now at ee942144f952
 
 The old version of bathroom is hidden again.
 
   $ hg log -G
-  @  0325a6c93ec2 (draft): animals
+  @  ee942144f952 (draft): animals
   |
-  o  adef71cd3160 (draft): bathroom stuff
+  o  a44c85f957d3 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -746,13 +746,13 @@
 now let's see where we are, and update to the successor
 
   $ hg parents
-  f9d416ff3ea5 (draft): animals
+  bf1b0d202029 (draft): animals
   working directory parent is obsolete!
   (use "hg evolve" to update to its successor)
   $ hg evolve
   update:[8] animals
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 0325a6c93ec2
+  working directory is now at ee942144f952
 
 Relocating unstable change after prune
 ----------------------------------------------
@@ -774,15 +774,15 @@
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  e8373c1af7dc (draft): SPAM SPAM SPAM
+  o  99f039c5ec9e (draft): SPAM SPAM SPAM
   |
-  @  0325a6c93ec2 (draft): animals
+  @  ee942144f952 (draft): animals
   |
-  o  adef71cd3160 (draft): bathroom stuff
+  o  a44c85f957d3 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -793,9 +793,9 @@
 
 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
 
-  $ hg prune 0325a6c93ec2
+  $ hg prune ee942144f952
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory now at adef71cd3160
+  working directory now at a44c85f957d3
   1 changesets pruned
   1 new unstable changesets
 
@@ -804,15 +804,15 @@
 is neither dead or obsolete.  My repository is in an unstable state again.
 
   $ hg log -G
-  o  e8373c1af7dc (draft): SPAM SPAM SPAM
+  o  99f039c5ec9e (draft): SPAM SPAM SPAM
   |
-  x  0325a6c93ec2 (draft): animals
+  x  ee942144f952 (draft): animals
   |
-  @  adef71cd3160 (draft): bathroom stuff
+  @  a44c85f957d3 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |
@@ -822,22 +822,22 @@
   
 
   $ hg log -r 'unstable()'
-  e8373c1af7dc (draft): SPAM SPAM SPAM
+  99f039c5ec9e (draft): SPAM SPAM SPAM
 
   $ hg evolve
   move:[17] SPAM SPAM SPAM
   atop:[14] bathroom stuff
   merging shopping
-  working directory is now at 5b9223df71d2
+  working directory is now at 40aa40daeefb
 
   $ hg log -G
-  @  5b9223df71d2 (draft): SPAM SPAM SPAM
+  @  40aa40daeefb (draft): SPAM SPAM SPAM
   |
-  o  adef71cd3160 (draft): bathroom stuff
+  o  a44c85f957d3 (draft): bathroom stuff
   |
-  o  21ddb8bb7ace (public): SPAM SPAM
+  o  a224f2a4fb9f (public): SPAM SPAM
   |
-  o  f49d36e87e8a (public): adding fruit
+  o  41aff6a42b75 (public): adding fruit
   |
   o  dfd3a2d7691e (public): adding condiment
   |