comparison tests/test-shelve.t @ 42733:d684449eef67

unshelve: forget unknown files after a partial unshelve

This is a follow-up patch to 6957f7b93e03. This allows hg to forget
unknown files after a partial unshelve.

Differential Revision: https://phab.mercurial-scm.org/D6724

42732:6d61be152c55

  $ cat > foo <<EOF
  > A
  > B
  > C
  > EOF
  $ hg shelve
  shelved as default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat foo
  B
  $ hg unshelve -i <<EOF
  > y
  > y
  > n
  > EOF
  unshelving change 'default'
  rebasing shelved changes
  diff --git a/foo b/foo
  2 hunks, 2 lines changed

  (enter ? for help) [Ynesfdaq?] y
  
  @@ -1,1 +1,2 @@
  +A
   B
  record change 1/2 to 'foo'?
  (enter ? for help) [Ynesfdaq?] y
  
  @@ -1,1 +2,2 @@
   B
  +C
  record change 2/2 to 'foo'?
  (enter ? for help) [Ynesfdaq?] n
  
  $ cat foo
  A
  B
  $ hg shelve --patch
  default         (*s ago)    changes to: add B to foo (glob)

42733:d684449eef67

  $ cat > foo <<EOF
  > A
  > B
  > C
  > EOF
  $ echo > garbage
  $ hg st
  M foo
  ? garbage
  $ hg shelve --unknown
  shelved as default
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ cat foo
  B
  $ hg unshelve -i <<EOF
  > y
  > y
  > n
  > y
  > y
  > EOF
  unshelving change 'default'
  rebasing shelved changes
  diff --git a/foo b/foo
  2 hunks, 2 lines changed

  (enter ? for help) [Ynesfdaq?] y
  
  @@ -1,1 +1,2 @@
  +A
   B
  record change 1/3 to 'foo'?
  (enter ? for help) [Ynesfdaq?] y
  
  @@ -1,1 +2,2 @@
   B
  +C
  record change 2/3 to 'foo'?
  (enter ? for help) [Ynesfdaq?] n
  
  diff --git a/garbage b/garbage
  new file mode 100644
  examine changes to 'garbage'?
  (enter ? for help) [Ynesfdaq?] y
  
  @@ -0,0 +1,1 @@
  +
  record change 3/3 to 'garbage'?
  (enter ? for help) [Ynesfdaq?] y
  
  $ hg st
  M foo
  ? garbage
  $ cat foo
  A
  B
  $ hg shelve --patch
  default         (*s ago)    changes to: add B to foo (glob)