tests/test-uncommit-interactive.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 14 Sep 2018 10:51:44 +0200
branchmercurial-4.3
changeset 4114 2aa2a8780a10
parent 3716 e5ba6531503e
permissions -rw-r--r--
test-compat: merge mercurial-4.4 into mercurial-4.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
================================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     2
||  The test for `hg uncommit --interactive`  ||
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
================================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
Repo Setup
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
============
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
2945
db9b8a4b2067 uncommit: small cleanup of the interactive test setup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2944
diff changeset
     8
  $ . $TESTDIR/testlib/common.sh
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  $ cat >> $HGRCPATH <<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
  > [ui]
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
  > interactive = true
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
  > [extensions]
2945
db9b8a4b2067 uncommit: small cleanup of the interactive test setup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2944
diff changeset
    13
  > evolve =
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  $ glog() {
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  >   hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
  > }
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  $ hg init repo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
  $ cd repo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    23
  $ touch a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
  $ cat >> a << EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  > 1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
  > 2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  > 3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  > 4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  > 5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  $ hg add a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  $ hg ci -m "The base commit"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
Make sure aborting the interactive selection does no magic
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
----------------------------------------------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  > q
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  new file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  examine changes to 'a'? [Ynesfdaq?] q
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  abort: user quit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  [255]
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
Make a commit with multiple hunks
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
---------------------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  $ cat > a << EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  > -2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
  > -1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  > 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  > 1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  > 2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  > 3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  > foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  > bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  > 4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  > 5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  > babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  diff -r 7733902a8d94 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  @@ -1,5 +1,11 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  $ hg ci -m "another one"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
2946
824e3b6e2730 uncommit: minor comment cleanup in the test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2945
diff changeset
    86
Not selecting anything to uncommit
824e3b6e2730 uncommit: minor comment cleanup in the test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2945
diff changeset
    87
==================================
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    95
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  3 hunks, 6 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    99
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   101
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   104
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   106
  discard change 1/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   109
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   114
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  discard change 2/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  @@ -4,2 +9,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   119
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   121
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  discard change 3/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  abort: nothing selected to uncommit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  [255]
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
Uncommit a chunk
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
3221
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   131
  $ hg amend --extract -n "note on amend --extract" -i<<EOF
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  > EOF
3287
4303a46b4167 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3223 3106
diff changeset
   137
  current hg version does not support storing note in obsmarker
4303a46b4167 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3223 3106
diff changeset
   138
  current hg version does not support storing note in obsmarker
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  3 hunks, 6 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   146
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   150
  discard change 1/3 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   151
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   155
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   157
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   160
  discard change 2/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   161
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   162
  @@ -4,2 +9,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   164
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   165
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   166
  discard change 3/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   167
  
3221
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   168
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   169
  $ hg obslog
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   170
  @  678a59e5ff90 (3) another one
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   171
  |
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   172
  x  f70fb463d5bf (1) another one
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   173
       rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3221
diff changeset
   174
         note: note on amend --extract
3221
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   175
  
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
The unselected part should be in the diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   177
-----------------------------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   180
  diff -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   181
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   183
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   185
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   186
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   188
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   189
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   190
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   191
The commit should contain the rest of part
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
------------------------------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   193
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   194
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   195
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   196
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   197
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   198
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   199
  # Node ID 678a59e5ff90754d5e94719bd82ad169be773c21
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   200
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   201
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   202
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   203
  diff -r 7733902a8d94 -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   204
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   205
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   206
  @@ -1,5 +1,8 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   207
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   208
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   209
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   210
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   211
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   212
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   213
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   214
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   215
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   216
Uncommiting on dirty working directory
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   217
======================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   218
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   219
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   220
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   221
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   222
  diff -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   223
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   224
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   225
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   226
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   227
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   228
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   229
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   230
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   231
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   232
3220
f0f4cc2febac uncommit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3090
diff changeset
   233
  $ hg uncommit -n "testing uncommit on dirty wdir" -i<<EOF
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   234
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   235
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   236
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   237
  > EOF
3287
4303a46b4167 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3223 3106
diff changeset
   238
  current hg version does not support storing note in obsmarker
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   239
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   240
  2 hunks, 3 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   241
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   242
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   243
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   244
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   245
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   246
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   247
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   248
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   249
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   250
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   251
  discard change 1/2 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   252
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   253
  @@ -4,2 +6,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   254
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   255
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   256
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   257
  discard change 2/2 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   258
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   259
  patching file a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   260
  Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   261
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   262
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   263
  diff -r 46e35360be47 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   264
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   265
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   266
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   267
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   268
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   269
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   270
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   271
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   272
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   273
  @@ -5,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   274
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   275
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   276
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   277
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   278
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   279
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   280
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   281
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   282
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   283
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   284
  # Node ID 46e35360be473bf761bedf3d05de4a68ffd9d9f8
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   285
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   286
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   287
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   288
  diff -r 7733902a8d94 -r 46e35360be47 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   289
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   290
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   291
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   292
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   293
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   294
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   295
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   296
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   297
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   298
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   299
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   300
Checking the obsolescence history
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   301
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   302
  $ hg obslog
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   303
  @  46e35360be47 (5) another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   304
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   305
  x  678a59e5ff90 (3) another one
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   306
  |    rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3221
diff changeset
   307
  |      note: testing uncommit on dirty wdir
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   308
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   309
  x  f70fb463d5bf (1) another one
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   310
       rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3221
diff changeset
   311
         note: note on amend --extract
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   312
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   313
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   314
Push the changes back to the commit and more commits for more testing
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   315
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   316
  $ hg amend
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   317
  $ glog
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   318
  @  7:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   319
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   320
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   321
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   322
  $ touch foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   323
  $ echo "hey" >> foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   324
  $ hg ci -Am "Added foo"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   325
  adding foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   326
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   327
Testing uncommiting a whole changeset and also for a file addition
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   328
==================================================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   329
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   330
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   331
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   332
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   333
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   334
  diff --git a/foo b/foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   335
  new file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   336
  examine changes to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   337
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   338
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   339
  +hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   340
  discard this change to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   341
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   342
  new changeset is empty
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   343
  (use 'hg prune .' to remove it)
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   344
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   345
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   346
  A foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   347
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   348
  diff -r 857367499298 foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   349
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   350
  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   351
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   352
  +hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   353
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   354
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   355
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   356
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   357
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   358
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   359
  # Node ID 857367499298e999b5841bb01df65f73088b5d3b
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   360
  # Parent  905eb2a23ea2d92073419d0e19165b90d36ea223
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   361
  Added foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   362
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   363
  $ hg amend
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   364
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   365
Testing to uncommit removed files completely
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   366
============================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   367
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   368
  $ hg rm a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   369
  $ hg ci -m "Removed a"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   370
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   371
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   372
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   373
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   374
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   375
  # Node ID 219cfe20964e93f8bb9bd82ceaa54d3b776046db
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   376
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   377
  Removed a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   378
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   379
  diff -r 42cc15efbec2 -r 219cfe20964e a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   380
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   381
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   382
  @@ -1,11 +0,0 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   383
  --2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   384
  --1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   385
  -0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   386
  -1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   387
  -2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   388
  -3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   389
  -foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   390
  -bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   391
  -4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   392
  -5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   393
  -babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   394
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   395
Not examining the file
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   396
----------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   397
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   398
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   399
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   400
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   401
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   402
  deleted file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   403
  examine changes to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   404
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   405
  abort: nothing selected to uncommit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   406
  [255]
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   407
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   408
Examining the file
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   409
------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   410
XXX: there is a bug in interactive selection as it is not letting to examine the
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   411
file. Tried with curses too. In the curses UI, if you just unselect the hunks
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   412
and the not file mod thing at the top, it will show the same "nothing unselected
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   413
to uncommit" message which is a bug in interactive selection.
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   414
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   415
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   416
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   417
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   418
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   419
  deleted file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   420
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   421
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   422
  new changeset is empty
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   423
  (use 'hg prune .' to remove it)
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   424
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   425
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   426
  diff -r 737487f1e5f8 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   427
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   428
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   429
  @@ -1,11 +0,0 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   430
  --2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   431
  --1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   432
  -0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   433
  -1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   434
  -2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   435
  -3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   436
  -foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   437
  -bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   438
  -4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   439
  -5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   440
  -babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   441
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   442
  R a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   443
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   444
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   445
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   446
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   447
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   448
  # Node ID 737487f1e5f853e55decb73ea31522c63e7f5980
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   449
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   450
  Removed a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   451
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   452
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   453
  $ hg prune .
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   454
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   455
  working directory now at 42cc15efbec2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   456
  1 changesets pruned
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   457
  $ hg revert --all
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   458
  undeleting a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   459
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   460
  $ glog
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   461
  @  12:42cc15efbec2@default(draft) Added foo
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   462
  |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   463
  o  7:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   464
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   465
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   466
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   467
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   468
Testing when a new file is added in the last commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   469
===================================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   470
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   471
  $ echo "foo" >> foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   472
  $ touch x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   473
  $ echo "abcd" >> x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   474
  $ hg add x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   475
  $ hg ci -m "Added x"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   476
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   477
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   478
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   479
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   480
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   481
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   482
  diff --git a/foo b/foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   483
  1 hunks, 1 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   484
  examine changes to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   485
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   486
  @@ -1,1 +1,2 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   487
   hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   488
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   489
  discard change 1/2 to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   490
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   491
  diff --git a/x b/x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   492
  new file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   493
  examine changes to 'x'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   494
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   495
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   496
  +abcd
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   497
  discard change 2/2 to 'x'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   498
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   499
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   500
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   501
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   502
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   503
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   504
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   505
  # Node ID 25a080d13cb23dbd014839f54d99a96e57ba7e9b
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   506
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   507
  Added x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   508
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   509
  diff -r 42cc15efbec2 -r 25a080d13cb2 x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   510
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   511
  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   512
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   513
  +abcd
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   514
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   515
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   516
  diff -r 25a080d13cb2 foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   517
  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   518
  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   519
  @@ -1,1 +1,2 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   520
   hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   521
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   522
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   523
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   524
  M foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   525
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   526
  $ hg revert --all
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   527
  reverting foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   528
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   529
Testing between the stack and with dirty working copy
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   530
=====================================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   531
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   532
  $ glog
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   533
  @  18:25a080d13cb2@default(draft) Added x
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   534
  |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   535
  o  12:42cc15efbec2@default(draft) Added foo
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   536
  |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3090
diff changeset
   537
  o  7:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   538
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   539
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   540
  
3090
975f5f42a877 test: use node instead of rev in uncommit -i test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
   541
  $ hg up 905eb2a23ea2
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   542
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   543
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   544
  $ touch bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   545
  $ echo "foo" >> bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   546
  $ hg add bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   547
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   548
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   549
  ? foo.orig
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   550
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   551
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   552
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   553
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   554
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   555
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   556
  # Node ID 905eb2a23ea2d92073419d0e19165b90d36ea223
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   557
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   558
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   559
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   560
  diff -r 7733902a8d94 -r 905eb2a23ea2 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   561
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   562
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   563
  @@ -1,5 +1,11 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   564
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   565
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   566
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   567
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   568
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   569
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   570
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   571
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   572
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   573
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   574
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   575
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   576
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   577
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   578
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   579
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   580
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   581
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   582
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   583
  3 hunks, 6 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   584
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   585
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   586
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   587
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   588
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   589
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   590
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   591
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   592
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   593
  discard change 1/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   594
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   595
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   596
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   597
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   598
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   599
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   600
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   601
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   602
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   603
  discard change 2/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   604
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   605
  @@ -4,2 +9,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   606
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   607
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   608
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   609
  discard change 3/3 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   610
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   611
  patching file a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   612
  Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3105
diff changeset
   613
  2 new unstable changesets
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   614
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   615
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   616
  diff -r 676366511f95 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   617
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   618
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   619
  @@ -8,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   620
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   621
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   622
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   623
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   624
  diff -r 676366511f95 bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   625
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   626
  +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   627
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   628
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   629
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   630
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   631
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   632
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   633
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   634
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   635
  # Node ID 676366511f95ca4122413dcf79b45eaab61fb387
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   636
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   637
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   638
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   639
  diff -r 7733902a8d94 -r 676366511f95 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   640
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   641
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   642
  @@ -1,5 +1,10 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   643
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   644
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   645
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   646
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   647
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   648
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   649
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   650
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   651
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   652
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   653
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   654
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   655
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   656
  ? foo.orig
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   657
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   658
More uncommit on the same dirty working copy
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   659
=============================================
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   660
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   661
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   662
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   663
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   664
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   665
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   666
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   667
  2 hunks, 5 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   668
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   669
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   670
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   671
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   672
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   673
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   674
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   675
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   676
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   677
  discard change 1/2 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   678
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   679
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   680
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   681
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   682
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   683
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   684
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   685
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   686
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   687
  discard change 2/2 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   688
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   689
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   690
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   691
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   692
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   693
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   694
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   695
  # Node ID 62d907d0c4fa13b4b8bfeed05f13751035daf963
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   696
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   697
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   698
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   699
  diff -r 7733902a8d94 -r 62d907d0c4fa a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   700
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   701
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   702
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   703
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   704
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   705
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   706
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   707
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   708
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   709
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   710
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   711
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   712
  diff -r 62d907d0c4fa a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   713
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   714
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   715
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   716
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   717
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   718
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   719
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   720
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   721
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   722
  @@ -5,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   723
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   724
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   725
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   726
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   727
  diff -r 62d907d0c4fa bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   728
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   729
  +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   730
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   731
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   732
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   733
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   734
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   735
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   736
  ? foo.orig
2944
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   737
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   738
Interactive uncommit with a pattern
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   739
-----------------------------------
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   740
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   741
(more setup)
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   742
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   743
  $ hg ci -m 'roaming changes'
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   744
  $ cat > b << EOF
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   745
  > a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   746
  > b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   747
  > c
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   748
  > d
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   749
  > e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   750
  > f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   751
  > h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   752
  > EOF
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   753
  $ hg add b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   754
  $ hg ci -m 'add b'
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   755
  $ echo 'celeste' >> a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   756
  $ echo 'i' >> b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   757
  $ hg ci -m 'some more changes'
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   758
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   759
  # HG changeset patch
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   760
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   761
  # Date 0 0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   762
  #      Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   763
  # Node ID be5c67225e80b050867862bbd9f4755c4e9207c5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   764
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   765
  some more changes
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   766
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   767
  diff -r c280a907fddc -r be5c67225e80 a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   768
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   769
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   770
  @@ -9,3 +9,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   771
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   772
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   773
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   774
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   775
  diff -r c280a907fddc -r be5c67225e80 b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   776
  --- a/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   777
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   778
  @@ -5,3 +5,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   779
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   780
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   781
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   782
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   783
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   784
  $ hg uncommit -i a << DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   785
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   786
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   787
  > DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   788
  diff --git a/a b/a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   789
  1 hunks, 1 lines changed
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   790
  examine changes to 'a'? [Ynesfdaq?] y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   791
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   792
  @@ -9,3 +9,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   793
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   794
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   795
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   796
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   797
  discard this change to 'a'? [Ynesfdaq?] y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   798
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   799
  $ hg status
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   800
  M a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   801
  ? foo.orig
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   802
  $ hg diff
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   803
  diff -r c701d7c8d18b a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   804
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   805
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   806
  @@ -9,3 +9,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   807
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   808
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   809
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   810
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   811
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   812
  # HG changeset patch
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   813
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   814
  # Date 0 0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   815
  #      Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   816
  # Node ID c701d7c8d18be55a92688f4458c26bd74fb1f525
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   817
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   818
  some more changes
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   819
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   820
  diff -r c280a907fddc -r c701d7c8d18b b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   821
  --- a/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   822
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   823
  @@ -5,3 +5,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   824
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   825
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   826
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   827
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   828
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   829
(reset)
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   830
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   831
  $ cat << EOF  > a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   832
  > -3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   833
  > -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   834
  > -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   835
  > 0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   836
  > 1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   837
  > 2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   838
  > 3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   839
  > foo
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   840
  > bar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   841
  > 4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   842
  > 5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   843
  > babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   844
  > celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   845
  > EOF
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   846
  $ hg amend 
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   847
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   848
Same but do not select some change in 'a'
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   849
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   850
  $ hg uncommit -i a << DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   851
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   852
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   853
  > n
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   854
  > DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   855
  diff --git a/a b/a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   856
  2 hunks, 2 lines changed
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   857
  examine changes to 'a'? [Ynesfdaq?] y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   858
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   859
  @@ -1,3 +1,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   860
  +-3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   861
   -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   862
   -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   863
   0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   864
  discard change 1/2 to 'a'? [Ynesfdaq?] y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   865
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   866
  @@ -9,3 +10,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   867
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   868
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   869
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   870
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   871
  discard change 2/2 to 'a'? [Ynesfdaq?] n
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   872
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   873
  $ hg status
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   874
  M a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   875
  ? foo.orig
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   876
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   877
  $ hg diff
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   878
  diff -r 28d5de12b225 a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   879
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   880
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   881
  @@ -1,3 +1,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   882
  +-3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   883
   -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   884
   -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   885
   0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   886
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   887
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   888
  # HG changeset patch
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   889
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   890
  # Date 0 0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   891
  #      Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   892
  # Node ID 28d5de12b225d1e0951110cced8d8994227be026
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   893
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   894
  some more changes
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   895
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   896
  diff -r c280a907fddc -r 28d5de12b225 a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   897
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   898
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   899
  @@ -9,3 +9,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   900
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   901
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   902
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   903
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   904
  diff -r c280a907fddc -r 28d5de12b225 b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   905
  --- a/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   906
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   907
  @@ -5,3 +5,4 @@
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   908
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   909
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   910
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   911
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   912
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   913
  $ cat b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   914
  a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   915
  b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   916
  c
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   917
  d
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   918
  e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   919
  f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   920
  h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   921
  i