Commits

Pierre-Yves David committed 8fd7ac5

tutorial: use rebase instead of graft -O

Comments (0)

Files changed (1)

tests/test-tutorial.t

 
   $ hg up 'p1(8d39a843582d)' # going on "bathroom stuff" parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg graft -O c48f32fb1787 # moving "SPAM SPAM" to the working directory parent
-  grafting revision 10
+  $ hg rebase --rev c48f32fb1787 --dest . # moving "SPAM SPAM" to the working directory parent
   merging shopping
   $ hg log -G
-  @  a2fccc2e7b08 (draft): SPAM SPAM
+  @  02e33960e937 (draft): SPAM SPAM
   |
   | o  8d39a843582d (draft): bathroom stuff
   |/
   # HG changeset patch
   # User test
   # Date 0 0
-  # Node ID a2fccc2e7b08bbce6af7255b989453f7089e4cf0
+  # Node ID 02e33960e937ad1bd59241ebdafd7a2494240ddf
   # Parent  387187ad9bd9d8f9a00a9fa804a26231db547429
   SPAM SPAM
   
 
 for simplicity shake we get the bathroom change in line again
 
-  $ hg rebase -r 8d39a843582d -d a2fccc2e7b08
+  $ hg rebase -r 8d39a843582d -d 02e33960e937
   merging shopping
   $ hg phase --draft .
   $ hg log -G
-  @  8a79ae8b029e (draft): bathroom stuff
+  @  a3515e5d0332 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  8a79ae8b029e (public): bathroom stuff
+  o  a3515e5d0332 (public): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   $ hg rollback
   repository tip rolled back to revision 4 (undo pull)
   $ hg log -G
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  8a79ae8b029e (draft): bathroom stuff
+  o  a3515e5d0332 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
 
 Remotely someone add a new changeset on top of the mutable "bathroom" on.
 
-  $ hg up 8a79ae8b029e -q
+  $ hg up a3515e5d0332 -q
   $ cat >> shopping << EOF
   > Giraffe
   > Rhino
 But at the same time, locally, this same "bathroom changeset" was updated.
 
   $ cd ../local
-  $ hg up 8a79ae8b029e -q
+  $ hg up a3515e5d0332 -q
   $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
   $ hg commit --amend
   $ hg log -G
-  @  30aa78f63aa1 (draft): bathroom stuff
+  @  36b5ba414186 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
 see both version showing up in the log.
 
   $ hg log -G
-  o  9ac5d0e790a2 (draft): animals
+  o  0b061760b677 (draft): animals
   |
-  | @  30aa78f63aa1 (draft): bathroom stuff
+  | @  36b5ba414186 (draft): bathroom stuff
   | |
-  x |  8a79ae8b029e (draft): bathroom stuff
+  x |  a3515e5d0332 (draft): bathroom stuff
   |/
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
-The older version 8a79ae8b029e never ceased to exist in the local repo. It was
+The older version a3515e5d0332 never ceased to exist in the local repo. It was
 jsut hidden and excluded from pull and push.
 
-.. note:: In hgview there is a nice doted relation highlighting 30aa78f63aa1 as a new version of 8a79ae8b029e. this is not yet ported to graphlog.
+.. note:: In hgview there is a nice doted relation highlighting 36b5ba414186 as a new version of a3515e5d0332. this is not yet ported to graphlog.
 
 Their is **unstable** changeset in this history now. Mercurial will refuse to
 share it with the outside:
   $ hg push other
   pushing to $TESTTMP/other
   searching for changes
-  abort: push includes unstable changeset: 9ac5d0e790a2!
+  abort: push includes unstable changeset: 0b061760b677!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   [255]
  
 
 
 
-To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
-30aa78f63aa1 the "hg evolve" command will make this for you.
+To resolve this unstable state, you need to rebase 0b061760b677 onto
+36b5ba414186 the "hg evolve" command will make this for you.
 
 It has a --dry-run option to only suggest the next move.
 
   $ hg evolve --dry-run
   move:[15] animals
   atop:[14] bathroom stuff
-  hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1
+  hg rebase -r 0b061760b677 -d 36b5ba414186
 
 Let's do it
 
-  $ hg rebase -r 9ac5d0e790a2 -d 30aa78f63aa1
+  $ hg rebase -r 0b061760b677 -d 36b5ba414186
   merging shopping
 
 The old version of bathroom is hidden again.
 
   $ hg log -G
-  @  01fddc75bfef (draft): animals
+  @  fd0d2651e61c (draft): animals
   |
-  o  30aa78f63aa1 (draft): bathroom stuff
+  o  36b5ba414186 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   no changes found
   Working directory parent is obsolete
 
-  $ hg up 01fddc75bfef
+  $ hg up fd0d2651e61c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Relocating unstable change after prune
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg log -G
-  o  cf306eb0d98f (draft): SPAM SPAM SPAM
+  o  56c68f64a3a0 (draft): SPAM SPAM SPAM
   |
-  @  01fddc75bfef (draft): animals
+  @  fd0d2651e61c (draft): animals
   |
-  o  30aa78f63aa1 (draft): bathroom stuff
+  o  36b5ba414186 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
 
 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
 
-  $ hg prune 01fddc75bfef
+  $ hg prune fd0d2651e61c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory now at 30aa78f63aa1
+  working directory now at 36b5ba414186
   1 new unstable changesets
 
 
 is neither dead or obsolete.  My repository is in an unstable state again.
 
   $ hg log -G
-  o  cf306eb0d98f (draft): SPAM SPAM SPAM
+  o  56c68f64a3a0 (draft): SPAM SPAM SPAM
   |
-  x  01fddc75bfef (draft): animals
+  x  fd0d2651e61c (draft): animals
   |
-  @  30aa78f63aa1 (draft): bathroom stuff
+  @  36b5ba414186 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |
   
 
   $ hg log -r 'unstable()'
-  cf306eb0d98f (draft): SPAM SPAM SPAM
+  56c68f64a3a0 (draft): SPAM SPAM SPAM
 
   $ hg evolve
   move:[17] SPAM SPAM SPAM
   merging shopping
 
   $ hg log -G
-  @  7e0a7cf763e4 (draft): SPAM SPAM SPAM
+  @  6dd8ca9dbcdc (draft): SPAM SPAM SPAM
   |
-  o  30aa78f63aa1 (draft): bathroom stuff
+  o  36b5ba414186 (draft): bathroom stuff
   |
-  o  a2fccc2e7b08 (public): SPAM SPAM
+  o  02e33960e937 (public): SPAM SPAM
   |
   o  387187ad9bd9 (public): adding fruit
   |