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