Patchwork D6699: tests: add test for unshelve --interactive --keep

login
register
mail settings
Submitter phabricator
Date Aug. 6, 2019, 11:56 a.m.
Message ID <bc3fa5372189ca685fc93c56fb19b65e@localhost.localdomain>
Download mbox | patch
Permalink /patch/41165/
State Not Applicable
Headers show

Comments

phabricator - Aug. 6, 2019, 11:56 a.m.
navaneeth.suresh updated this revision to Diff 16131.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6699?vs=16111&id=16131

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6699/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6699

AFFECTED FILES
  tests/test-shelve.t

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1453,3 +1453,33 @@ 
   record this change to 'bar2'?
   (enter ? for help) [Ynesfdaq?] y
   
+-- test for unshelve --interactive --keep
+  $ hg unshelve -i --keep <<EOF
+  > y
+  > y
+  > EOF
+  unshelving change 'default'
+  temporarily committing pending changes (restore with 'hg unshelve --abort')
+  rebasing shelved changes
+  diff --git a/foo b/foo
+  1 hunks, 1 lines changed
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -1,2 +1,3 @@
+   A
+   B
+  +C
+  record this change to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  $ hg shelve --patch
+  default         (1s ago)    changes to: add B to foo
+  
+  diff --git a/foo b/foo
+  --- a/foo
+  +++ b/foo
+  @@ -1,2 +1,3 @@
+   A
+   B
+  +C