pick: Add a test to check that pick pick the right content draft
authorBoris Feld <boris.feld@octobus.net>
Tue, 04 Sep 2018 19:53:08 +0200
changeset 5219 acc3253f0ebc
parent 4054 46cd437fd3d2
pick: Add a test to check that pick pick the right content
tests/test-grab.t
--- a/tests/test-grab.t	Fri Aug 31 14:26:37 2018 +0200
+++ b/tests/test-grab.t	Tue Sep 04 19:53:08 2018 +0200
@@ -335,3 +335,106 @@
 
   $ hg phase -r .
   13: secret
+
+Checking that grab don't forget new files behind
+
+  $ hg glog
+  @  13:1705aa17bfed added l
+  |
+  o  11:10427de9e26e add b
+  |
+  o  10:c437988de89f foo to b
+  |
+  o  8:44e155eb95c7 add c
+  |
+  o  7:2ccc03d1d096 foo to c
+  |
+  o  4:d46dc301d92f add y
+  |
+  o  3:8e224524cd09 add x
+  |
+  o  0:1f0dee641bb7 add a
+  
+
+  $ hg up 10427de9e26e
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ mkcommit comment
+  created new head
+
+  $ hg glog
+  @  14:d6b8004e6bba add comment
+  |
+  | o  13:1705aa17bfed added l
+  |/
+  o  11:10427de9e26e add b
+  |
+  o  10:c437988de89f foo to b
+  |
+  o  8:44e155eb95c7 add c
+  |
+  o  7:2ccc03d1d096 foo to c
+  |
+  o  4:d46dc301d92f add y
+  |
+  o  3:8e224524cd09 add x
+  |
+  o  0:1f0dee641bb7 add a
+  
+
+  $ hg export .
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID d6b8004e6bbac8f43d0954c5deb0ccdc8df04dd5
+  # Parent  10427de9e26e48d0a0940780a0b62f5a6bd23117
+  add comment
+  
+  diff -r 10427de9e26e -r d6b8004e6bba comment
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/comment	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +comment
+
+  $ hg up 1705aa17bfed
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ hg pick d6b8004e6bba
+  picking 14:d6b8004e6bba "add comment"
+
+  $ hg export .
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID fb65b6b1afa49130ea3b0d376b730faa08b2123b
+  # Parent  1705aa17bfed915e19659e41d416c354695cf8b1
+  add comment
+  
+  diff -r 1705aa17bfed -r fb65b6b1afa4 comment
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/comment	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +comment
+
+  $ hg glog
+  @  15:fb65b6b1afa4 add comment
+  |
+  o  13:1705aa17bfed added l
+  |
+  o  11:10427de9e26e add b
+  |
+  o  10:c437988de89f foo to b
+  |
+  o  8:44e155eb95c7 add c
+  |
+  o  7:2ccc03d1d096 foo to c
+  |
+  o  4:d46dc301d92f add y
+  |
+  o  3:8e224524cd09 add x
+  |
+  o  0:1f0dee641bb7 add a
+  
+