changeset 38237:66fc2ef8dbff

graft: add test showing --continue not preserving --log passed earlier This patch shows that when we do `hg graft --continue`, the value of --log flag passed when initial graft was run was not used. Next patch will fix this and tests will help us in realising that. Differential Revision: https://phab.mercurial-scm.org/D3661
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 26 May 2018 02:57:36 +0530
parents a6347ae6168d
children 2b8c8b8d1a06
files tests/test-graft.t
diffstat 1 files changed, 29 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-graft.t	Sun Jun 03 13:40:58 2018 +0900
+++ b/tests/test-graft.t	Sat May 26 02:57:36 2018 +0530
@@ -1536,3 +1536,32 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     bar to b
   
+Test that --log is preserved and reused in `hg graft --continue`
+
+  $ hg up '.^^'
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg graft -r 1 -r 2 --log
+  grafting 1:80e6d2c47cfe "added b"
+  merging b
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
+  abort: unresolved conflicts, can't continue
+  (use 'hg resolve' and 'hg graft --continue --log')
+  [255]
+
+  $ echo foobar > b
+  $ hg resolve -m
+  (no more unresolved files)
+  continue: hg graft --continue
+
+  $ hg graft --continue
+  grafting 1:80e6d2c47cfe "added b"
+  grafting 2:8be98ac1a569 "added c"
+
+  $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
+  @  11:7ee8d3496b19 added c
+  |
+  o  10:802f1eae3af3 added b
+  |
+  o  3:9e887f7a939c bar to b
+  |
+  ~