tests/test-uncommit-interactive.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 16 Jan 2018 04:53:09 +0100
changeset 3423 e21b4f3b32c1
parent 3223 73b4e84df0bd
child 3287 4303a46b4167
child 3563 d4c457c1ae0d
permissions -rw-r--r--
branching: merge release tags into default
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
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  3 hunks, 6 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  +0
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
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
  discard change 1/3 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   150
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   151
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   155
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   157
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
  discard change 2/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   160
  @@ -4,2 +9,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   161
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   162
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   164
  discard change 3/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   165
  
3221
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   166
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   167
  $ hg obslog
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   168
  @  678a59e5ff90 (3) another one
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   169
  |
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   170
  x  f70fb463d5bf (1) another one
9f3521cc4c90 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3220
diff changeset
   171
       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
   172
         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
   173
  
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   174
The unselected part should be in the diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   175
-----------------------------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   177
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
  diff -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  --- 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
   180
  +++ 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
   181
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   183
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  +0
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
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   188
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   189
The commit should contain the rest of part
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
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   193
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   194
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   195
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   196
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   197
  # Node ID 678a59e5ff90754d5e94719bd82ad169be773c21
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   198
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   199
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   200
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   201
  diff -r 7733902a8d94 -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   202
  --- 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
   203
  +++ 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
   204
  @@ -1,5 +1,8 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   205
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   206
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   207
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   208
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   209
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   210
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   211
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   212
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   213
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   214
Uncommiting on dirty working directory
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
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   217
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   218
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   219
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   220
  diff -r 678a59e5ff90 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   221
  --- 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
   222
  +++ 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
   223
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   224
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   225
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   226
  +0
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
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   229
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   230
3220
f0f4cc2febac uncommit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3090
diff changeset
   231
  $ 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
   232
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   233
  > n
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
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   236
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   237
  2 hunks, 3 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   238
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   239
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   240
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   241
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   242
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   243
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   244
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   245
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   246
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   247
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   248
  discard change 1/2 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   249
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   250
  @@ -4,2 +6,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   251
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   252
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   253
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   254
  discard change 2/2 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   255
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   256
  patching file a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   257
  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
   258
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   259
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   260
  diff -r 46e35360be47 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   261
  --- 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
   262
  +++ 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
   263
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   264
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   265
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   266
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   267
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   268
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   269
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   270
  @@ -5,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   271
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   272
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   273
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   274
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   275
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   276
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   277
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   278
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   279
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   280
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   281
  # Node ID 46e35360be473bf761bedf3d05de4a68ffd9d9f8
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   282
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   283
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   284
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   285
  diff -r 7733902a8d94 -r 46e35360be47 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   286
  --- 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
   287
  +++ 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
   288
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   289
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   290
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   291
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   292
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   293
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   294
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   295
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   296
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   297
Checking the obsolescence history
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   298
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   299
  $ hg obslog
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   300
  @  46e35360be47 (5) another one
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
  x  678a59e5ff90 (3) another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   303
  |    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
   304
  |      note: testing uncommit on dirty wdir
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   305
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   306
  x  f70fb463d5bf (1) another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   307
       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
   308
         note: note on amend --extract
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   309
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   310
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   311
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
   312
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   313
  $ hg amend
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   314
  $ glog
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   315
  @  6:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   316
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   317
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   318
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   319
  $ touch foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   320
  $ echo "hey" >> foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   321
  $ hg ci -Am "Added foo"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   322
  adding foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   323
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   324
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
   325
==================================================================
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
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   328
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   329
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   330
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   331
  diff --git a/foo b/foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   332
  new file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   333
  examine changes to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   334
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   335
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   336
  +hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   337
  discard this change to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   338
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   339
  new changeset is empty
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   340
  (use 'hg prune .' to remove it)
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
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   343
  A foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   344
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   345
  diff -r 857367499298 foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   346
  --- /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
   347
  +++ 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
   348
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   349
  +hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   350
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   351
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   352
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   353
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   354
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   355
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   356
  # Node ID 857367499298e999b5841bb01df65f73088b5d3b
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   357
  # Parent  905eb2a23ea2d92073419d0e19165b90d36ea223
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   358
  Added foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   359
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   360
  $ hg amend
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   361
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   362
Testing to uncommit removed files completely
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   363
============================================
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
  $ hg rm a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   366
  $ hg ci -m "Removed a"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   367
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   368
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   369
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   370
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   371
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   372
  # Node ID 219cfe20964e93f8bb9bd82ceaa54d3b776046db
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   373
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   374
  Removed a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   375
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   376
  diff -r 42cc15efbec2 -r 219cfe20964e a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   377
  --- 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
   378
  +++ /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
   379
  @@ -1,11 +0,0 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   380
  --2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   381
  --1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   382
  -0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   383
  -1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   384
  -2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   385
  -3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   386
  -foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   387
  -bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   388
  -4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   389
  -5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   390
  -babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   391
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   392
Not examining the file
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   393
----------------------
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
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   396
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   397
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   398
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   399
  deleted file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   400
  examine changes to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   401
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   402
  abort: nothing selected to uncommit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   403
  [255]
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
Examining the file
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   406
------------------
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   407
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
   408
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
   409
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
   410
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
   411
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   412
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   413
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   414
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   415
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   416
  deleted file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   417
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   418
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   419
  new changeset is empty
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   420
  (use 'hg prune .' to remove it)
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
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   423
  diff -r 737487f1e5f8 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   424
  --- 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
   425
  +++ /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
   426
  @@ -1,11 +0,0 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   427
  --2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   428
  --1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   429
  -0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   430
  -1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   431
  -2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   432
  -3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   433
  -foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   434
  -bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   435
  -4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   436
  -5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   437
  -babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   438
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   439
  R a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   440
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   441
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   442
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   443
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   444
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   445
  # Node ID 737487f1e5f853e55decb73ea31522c63e7f5980
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   446
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   447
  Removed a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   448
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   449
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   450
  $ hg prune .
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   451
  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
   452
  working directory now at 42cc15efbec2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   453
  1 changesets pruned
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   454
  $ hg revert --all
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   455
  undeleting a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   456
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   457
  $ glog
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   458
  @  10:42cc15efbec2@default(draft) Added foo
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   459
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   460
  o  6:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   461
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   462
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   463
  
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
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
   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
  $ echo "foo" >> foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   469
  $ touch x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   470
  $ echo "abcd" >> x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   471
  $ hg add x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   472
  $ hg ci -m "Added x"
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   473
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   474
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   475
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   476
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   477
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   478
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   479
  diff --git a/foo b/foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   480
  1 hunks, 1 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   481
  examine changes to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   482
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   483
  @@ -1,1 +1,2 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   484
   hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   485
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   486
  discard change 1/2 to 'foo'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   487
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   488
  diff --git a/x b/x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   489
  new file mode 100644
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   490
  examine changes to 'x'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   491
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   492
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   493
  +abcd
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   494
  discard change 2/2 to 'x'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   495
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   496
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   497
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   498
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   499
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   500
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   501
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   502
  # Node ID 25a080d13cb23dbd014839f54d99a96e57ba7e9b
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   503
  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   504
  Added x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   505
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   506
  diff -r 42cc15efbec2 -r 25a080d13cb2 x
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   507
  --- /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
   508
  +++ 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
   509
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   510
  +abcd
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   511
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   512
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   513
  diff -r 25a080d13cb2 foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   514
  --- 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
   515
  +++ 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
   516
  @@ -1,1 +1,2 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   517
   hey
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   518
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   519
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   520
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   521
  M 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 revert --all
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   524
  reverting 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
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
   527
=====================================================
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
  $ glog
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   530
  @  16:25a080d13cb2@default(draft) Added x
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   531
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   532
  o  10:42cc15efbec2@default(draft) Added foo
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   533
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   534
  o  6:905eb2a23ea2@default(draft) another one
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   535
  |
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   536
  o  0:7733902a8d94@default(draft) The base commit
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   537
  
3090
975f5f42a877 test: use node instead of rev in uncommit -i test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
   538
  $ hg up 905eb2a23ea2
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   539
  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
   540
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   541
  $ touch bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   542
  $ echo "foo" >> bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   543
  $ hg add bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   544
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   545
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   546
  ? foo.orig
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   547
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   548
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   549
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   550
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   551
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   552
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   553
  # Node ID 905eb2a23ea2d92073419d0e19165b90d36ea223
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   554
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   555
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   556
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   557
  diff -r 7733902a8d94 -r 905eb2a23ea2 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   558
  --- 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
   559
  +++ 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
   560
  @@ -1,5 +1,11 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   561
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   562
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   563
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   564
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   565
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   566
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   567
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   568
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   569
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   570
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   571
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   572
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   573
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   574
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   575
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   576
  > n
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
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   579
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   580
  3 hunks, 6 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   581
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   582
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   583
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   584
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   585
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   586
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   587
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   588
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   589
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   590
  discard change 1/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   591
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   592
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   593
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   594
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   595
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   596
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   597
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   598
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   599
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   600
  discard change 2/3 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   601
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   602
  @@ -4,2 +9,3 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   603
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   604
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   605
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   606
  discard change 3/3 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   607
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   608
  patching file a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   609
  Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   610
  2 new orphan changesets
2941
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   611
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   612
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   613
  diff -r 676366511f95 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   614
  --- 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
   615
  +++ 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
   616
  @@ -8,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   617
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   618
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   619
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   620
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   621
  diff -r 676366511f95 bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   622
  --- /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
   623
  +++ 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
   624
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   625
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   626
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   627
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   628
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   629
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   630
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   631
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   632
  # Node ID 676366511f95ca4122413dcf79b45eaab61fb387
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   633
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   634
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   635
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   636
  diff -r 7733902a8d94 -r 676366511f95 a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   637
  --- 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
   638
  +++ 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
   639
  @@ -1,5 +1,10 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   640
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   641
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   642
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   643
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   644
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   645
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   646
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   647
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   648
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   649
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   650
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   651
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   652
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   653
  ? foo.orig
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   654
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   655
More uncommit on the same dirty working copy
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   656
=============================================
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
  $ hg uncommit -i<<EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   659
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   660
  > y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   661
  > n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   662
  > EOF
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   663
  diff --git a/a b/a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   664
  2 hunks, 5 lines changed
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   665
  examine changes to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   666
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   667
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   668
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   669
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   670
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   671
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   672
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   673
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   674
  discard change 1/2 to 'a'? [Ynesfdaq?] y
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   675
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   676
  @@ -1,5 +4,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   677
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   678
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   679
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   680
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   681
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   682
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   683
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   684
  discard change 2/2 to 'a'? [Ynesfdaq?] n
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   685
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   686
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   687
  $ hg exp
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   688
  # HG changeset patch
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   689
  # User test
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   690
  # Date 0 0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   691
  #      Thu Jan 01 00:00:00 1970 +0000
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   692
  # Node ID 62d907d0c4fa13b4b8bfeed05f13751035daf963
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   693
  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   694
  another one
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   695
  
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   696
  diff -r 7733902a8d94 -r 62d907d0c4fa a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   697
  --- 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
   698
  +++ 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
   699
  @@ -1,5 +1,7 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   700
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   701
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   702
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   703
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   704
  +bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   705
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   706
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   707
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   708
  $ hg diff
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   709
  diff -r 62d907d0c4fa a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   710
  --- 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
   711
  +++ 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
   712
  @@ -1,3 +1,6 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   713
  +-2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   714
  +-1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   715
  +0
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   716
   1
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   717
   2
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   718
   3
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   719
  @@ -5,3 +8,4 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   720
   bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   721
   4
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   722
   5
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   723
  +babar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   724
  diff -r 62d907d0c4fa bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   725
  --- /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
   726
  +++ 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
   727
  @@ -0,0 +1,1 @@
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   728
  +foo
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   729
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   730
  $ hg status
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   731
  M a
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   732
  A bar
b0458b9e1b47 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   733
  ? 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
   734
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   735
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
   736
-----------------------------------
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
(more setup)
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
  $ 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
   741
  $ 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
   742
  > a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   743
  > b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   744
  > c
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   745
  > d
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   746
  > e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   747
  > f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   748
  > h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   749
  > EOF
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   750
  $ 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
   751
  $ 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
   752
  $ 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
   753
  $ 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
   754
  $ 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
   755
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   756
  # 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
   757
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   758
  # 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
   759
  #      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
   760
  # 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
   761
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   762
  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
   763
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   764
  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
   765
  --- 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
   766
  +++ 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
   767
  @@ -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
   768
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   769
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   770
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   771
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   772
  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
   773
  --- 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
   774
  +++ 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
   775
  @@ -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
   776
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   777
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   778
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   779
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   780
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   781
  $ 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
   782
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   783
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   784
  > DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   785
  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
   786
  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
   787
  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
   788
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   789
  @@ -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
   790
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   791
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   792
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   793
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   794
  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
   795
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   796
  $ hg status
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   797
  M a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   798
  ? foo.orig
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   799
  $ hg diff
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   800
  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
   801
  --- 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
   802
  +++ 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
   803
  @@ -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
   804
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   805
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   806
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   807
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   808
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   809
  # 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
   810
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   811
  # 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
   812
  #      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
   813
  # 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
   814
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   815
  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
   816
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   817
  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
   818
  --- 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
   819
  +++ 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
   820
  @@ -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
   821
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   822
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   823
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   824
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   825
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   826
(reset)
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   827
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   828
  $ 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
   829
  > -3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   830
  > -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   831
  > -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   832
  > 0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   833
  > 1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   834
  > 2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   835
  > 3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   836
  > foo
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   837
  > bar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   838
  > 4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   839
  > 5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   840
  > babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   841
  > celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   842
  > EOF
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   843
  $ hg amend 
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   844
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   845
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
   846
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   847
  $ 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
   848
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   849
  > y
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   850
  > n
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   851
  > DONE
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   852
  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
   853
  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
   854
  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
   855
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   856
  @@ -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
   857
  +-3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   858
   -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   859
   -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   860
   0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   861
  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
   862
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   863
  @@ -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
   864
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   865
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   866
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   867
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   868
  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
   869
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   870
  $ hg status
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   871
  M a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   872
  ? foo.orig
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   873
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   874
  $ hg diff
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   875
  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
   876
  --- 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
   877
  +++ 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
   878
  @@ -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
   879
  +-3
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   880
   -2
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   881
   -1
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   882
   0
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   883
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   884
  $ hg export
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   885
  # 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
   886
  # User test
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   887
  # 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
   888
  #      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
   889
  # 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
   890
  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   891
  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
   892
  
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   893
  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
   894
  --- 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
   895
  +++ 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
   896
  @@ -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
   897
   4
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   898
   5
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   899
   babar
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   900
  +celeste
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   901
  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
   902
  --- 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
   903
  +++ 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
   904
  @@ -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
   905
   e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   906
   f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   907
   h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   908
  +i
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   909
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   910
  $ cat b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   911
  a
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   912
  b
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   913
  c
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   914
  d
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   915
  e
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   916
  f
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   917
  h
281a11bfda43 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2943
diff changeset
   918
  i