author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Fri, 09 Nov 2018 20:18:59 +0100 | |
branch | mercurial-4.4 |
changeset 4227 | 4684e6db4480 |
parent 3877 | 96bbea985b25 |
child 3936 | 537fd9a86c06 |
child 5123 | 900668a93629 |
child 5236 | 6c0797ec50b6 |
permissions | -rw-r--r-- |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
** Test for the `--patch` flag for `hg amend` command ** |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
Setup |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
$ cat >> $HGRCPATH << EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
> [alias] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
> glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [diff] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> git = 1 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
> [extensions] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
Reposetup |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ hg init repo |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ cd repo |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ echo foo > a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ hg ci -Aqm "added a" |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
# Node ID f7ad4196431346de3c33c52e75374fba45e04313 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
# Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
new file mode 100644 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
@@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
+foo |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
Testing of just changing the diff, not the patch metadata |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
========================================================== |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
Testing the normal case |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
----------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
> # Node ID f7ad4196431346de3c33c52e75374fba45e04313 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
> # Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
> added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
> new file mode 100644 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
Making sure the amended commit is correct |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
# Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
# Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
new file mode 100644 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
@@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
@ 1:af624b221c0c added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
() draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
Obsolsence history is fine |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
$ hg obslog -p -r . |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
@ af624b221c0c (1) added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
| |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
x f7ad41964313 (0) added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
rewritten(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
@@ -1,1 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
-foo |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
Diff and status are good too |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
$ hg diff |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
$ cat a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
Dirstate parents should be correctly set |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
$ hg parents |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
changeset: 1:af624b221c0c |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
tag: tip |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
parent: -1:000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
user: test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
summary: added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
Trying to amend with a wrong patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
---------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
Having context which was is not present |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
> # Node ID c6ba250efbf73e671f2ca24b79db2c178ccbfff9 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
> # Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
> added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
> new file mode 100644 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 |
> I was not there before! |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
142 |
failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@ |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
(1 0 1 1) |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
144 |
try to fix the patch (yn)? y |
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
145 |
abort: patch unchanged |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 |
Having deletions which dont exists |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
> # Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
> # Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
> added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
> new file mode 100644 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
162 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 |
> -I was not deleted before! |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
168 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
171 |
failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@ |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 |
(1 0 1 1) |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
173 |
try to fix the patch (yn)? y |
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
174 |
abort: patch unchanged |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
177 |
Changing the file mode using amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
178 |
------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
179 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
181 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
182 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
183 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
185 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
187 |
> # Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 |
> # Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
189 |
> added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
190 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 |
> new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
192 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
193 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
195 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
196 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
197 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
199 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
200 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 |
$ hg exp --git |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
202 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
203 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
204 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
205 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
206 |
# Node ID 3a99e4b7ac73da799e20ae56914e3dd5b1a22d4d |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
207 |
# Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
208 |
added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
209 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
210 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
211 |
new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
212 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
213 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
214 |
@@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
215 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
216 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
217 |
Changing the file using amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
218 |
------------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
219 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
221 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
222 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
223 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
224 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
225 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
227 |
> # Node ID 3a99e4b7ac73da799e20ae56914e3dd5b1a22d4d |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 |
> # Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
229 |
> added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
230 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
231 |
> new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
232 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
233 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
234 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
235 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
236 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
237 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
238 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
239 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
240 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
241 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
242 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
243 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
244 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
245 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
246 |
# Node ID fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
247 |
# Parent 0000000000000000000000000000000000000000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
248 |
added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
249 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
250 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
251 |
new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
252 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
253 |
+++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
254 |
@@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
255 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
256 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
257 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
258 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
259 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
260 |
$ ls |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
261 |
changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
262 |
editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
263 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
264 |
Handling both deletions and additions |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
265 |
------------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
266 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
267 |
$ echo foobar > changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
268 |
$ hg ci -m "foobar to changedfile" |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
269 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
270 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
271 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
273 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
274 |
# Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
276 |
foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
280 |
+++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 |
@@ -1,1 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
282 |
-Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
283 |
+foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
284 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
286 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
288 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
290 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
291 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
292 |
> # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
293 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
294 |
> foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
295 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
296 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
297 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
298 |
> @@ -1,1 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
299 |
> -Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
300 |
> +foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
301 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
302 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
303 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
304 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
305 |
abort: nothing changed |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
306 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
307 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
308 |
Cannot change lines which are deleted |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
309 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
310 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
311 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
312 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
313 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
314 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
315 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
316 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
317 |
> # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
318 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
319 |
> foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
320 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
321 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
322 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
323 |
> @@ -1,1 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
324 |
> -Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
325 |
> +foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
326 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
327 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
328 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
329 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
330 |
patching file changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
331 |
Hunk #1 FAILED at 0 |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
332 |
failed to apply edited patch: patch failed to apply |
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
333 |
try to fix the patch (yn)? y |
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
334 |
abort: patch unchanged |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
335 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
336 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
337 |
Add more addition to the patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
338 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
339 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
340 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
341 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
342 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
343 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
344 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
345 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
346 |
> # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
347 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
348 |
> foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
349 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
350 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
351 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
352 |
> @@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
353 |
> -Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
354 |
> +foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
355 |
> +babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
356 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
357 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
358 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
359 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
360 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
361 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
362 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
363 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
364 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
365 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
366 |
# Node ID 5d54400acb70b88f07128a1df497ed794b0b177b |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
367 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
368 |
foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
369 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
370 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
371 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
372 |
+++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
373 |
@@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
374 |
-Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
375 |
+foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
376 |
+babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
377 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
378 |
$ cat changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
379 |
foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
380 |
babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
381 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
382 |
Introduce files which were not there |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
383 |
------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
384 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
385 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
386 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
387 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
388 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
389 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
390 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
391 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
392 |
> # Node ID 5d54400acb70b88f07128a1df497ed794b0b177b |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
393 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
394 |
> foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
395 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
396 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
397 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
398 |
> @@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
399 |
> -Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
400 |
> +foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
401 |
> +babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
402 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
403 |
> new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
404 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
405 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
406 |
> @@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
407 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
408 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
409 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
410 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
411 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
412 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
413 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
414 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
415 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
416 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
417 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
418 |
# Node ID c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
419 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
420 |
foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
421 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
422 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
423 |
new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
424 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
425 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
426 |
@@ -0,0 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
427 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
428 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
429 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
430 |
+++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
431 |
@@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
432 |
-Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
433 |
+foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
434 |
+babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
435 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
436 |
Delete files which were not deleted in the first place |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
437 |
------------------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
438 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
439 |
$ echo Hello >> a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
440 |
$ hg ci -m "hello to a" |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
441 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
442 |
@ 7:3d62c45a1699 hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
443 |
| () draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
444 |
o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
445 |
| () draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
446 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
447 |
() draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
448 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
449 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
450 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
451 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
452 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
453 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
454 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
455 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
456 |
> # Node ID 3d62c45a1699b11c7ecae573f013601712f2cc5f |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
457 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
458 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
459 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
460 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
461 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
462 |
> @@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
463 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
464 |
> +Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
465 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
466 |
> deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
467 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
468 |
> +++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
469 |
> @@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
470 |
> -foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
471 |
> -babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
472 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
473 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
474 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
475 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
476 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
477 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
478 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
479 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
480 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
481 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
482 |
# Node ID c9875799c53fb862c0dbaf01500459c9397373a4 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
483 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
484 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
485 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
486 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
487 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
488 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
489 |
@@ -1,1 +1,2 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
490 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
491 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
492 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
493 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
494 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
495 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
496 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
497 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
498 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
499 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
500 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
501 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
502 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
503 |
$ cat changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
504 |
cat: changedfile: No such file or directory |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
505 |
[1] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
506 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
507 |
Testing sercret phase preservation during `hg amend --patch` |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
508 |
------------------------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
509 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
510 |
$ hg phase -r . --secret --force |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
511 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
512 |
$ hg phase -r . |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
513 |
8: secret |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
514 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
515 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
516 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
517 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
518 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
519 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
520 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
521 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
522 |
> # Node ID c9875799c53fb862c0dbaf01500459c9397373a4 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
523 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
524 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
525 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
526 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
527 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
528 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
529 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
530 |
> +Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
531 |
> +mello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
532 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
533 |
> deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
534 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
535 |
> +++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
536 |
> @@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
537 |
> -foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
538 |
> -babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
539 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
540 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
541 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
542 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
543 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
544 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
545 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
546 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
547 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
548 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
549 |
# Node ID 4414485658e719a1f3d5e58bc8b2412385aa1592 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
550 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
551 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
552 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
553 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
554 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
555 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
556 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
557 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
558 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
559 |
+mello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
560 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
561 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
562 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
563 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
564 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
565 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
566 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
567 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
568 |
$ hg phase -r . |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
569 |
9: secret |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
570 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
571 |
Testing bookmark movement on amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
572 |
------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
573 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
574 |
$ hg bookmark foo |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
575 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
576 |
@ 9:4414485658e7 hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
577 |
| (foo) secret |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
578 |
o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
579 |
| () draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
580 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
581 |
() draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
582 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
583 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
584 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
585 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
586 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
587 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
588 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
589 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
590 |
> # Node ID 4414485658e719a1f3d5e58bc8b2412385aa1592 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
591 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
592 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
593 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
594 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
595 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
596 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
597 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
598 |
> +Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
599 |
> +bello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
600 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
601 |
> deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
602 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
603 |
> +++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
604 |
> @@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
605 |
> -foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
606 |
> -babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
607 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
608 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
609 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
610 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
611 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
612 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
613 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
614 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
615 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
616 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
617 |
# Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
618 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
619 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
620 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
621 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
622 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
623 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
624 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
625 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
626 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
627 |
+bello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
628 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
629 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
630 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
631 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
632 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
633 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
634 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
635 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
636 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
637 |
@ 10:36454bda1fdb hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
638 |
| (foo) secret |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
639 |
o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
640 |
| () draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
641 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
642 |
() draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
643 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
644 |
Trying to amend --patch a public changeset |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
645 |
------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
646 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
647 |
$ hg phase -r . --public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
648 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
649 |
@ 10:36454bda1fdb hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
650 |
| (foo) public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
651 |
o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
652 |
| () public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
653 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
654 |
() public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
655 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
656 |
$ HGEDITOR=cat hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
657 |
abort: cannot amend public changesets: 36454bda1fdb |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
658 |
(see 'hg help phases' for details) |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
659 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
660 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
661 |
$ hg phase -r . --draft --force |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
662 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
663 |
Trying on a dirty working directory |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
664 |
------------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
665 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
666 |
$ echo bar > bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
667 |
$ hg add bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
668 |
$ HGEDITOR=cat hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
669 |
abort: uncommitted changes |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
670 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
671 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
672 |
$ hg revert --all |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
673 |
forgetting bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
674 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
675 |
Trying to pass filenames, only mentioned file names should be popped up in |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
676 |
editor and rest should stay in the commit as they were |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
677 |
-------------------------------------------------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
678 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
679 |
Checking the we pop-up with the files which were mentioned |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
680 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
681 |
$ HGEDITOR=cat hg amend --patch changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
682 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
683 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
684 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
685 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
686 |
# Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
687 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
688 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
689 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
690 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
691 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
692 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
693 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
694 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
695 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
696 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
697 |
abort: nothing changed |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
698 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
699 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
700 |
$ HGEDITOR=cat hg amend --patch a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
701 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
702 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
703 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
704 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
705 |
# Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
706 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
707 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
708 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
709 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
710 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
711 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
712 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
713 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
714 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
715 |
+bello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
716 |
abort: nothing changed |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
717 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
718 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
719 |
$ HGEDITOR=cat hg amend --patch changedfile a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
720 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
721 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
722 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
723 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
724 |
# Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
725 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
726 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
727 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
728 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
729 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
730 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
731 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
732 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
733 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
734 |
+bello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
735 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
736 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
737 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
738 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
739 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
740 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
741 |
-babar |
3661
61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3660
diff
changeset
|
742 |
abort: patch unchanged |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
743 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
744 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
745 |
$ HGEDITOR=cat hg amend --patch doesnotexists |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
746 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
747 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
748 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
749 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
750 |
# Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
751 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
752 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
753 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
754 |
abort: nothing changed |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
755 |
[255] |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
756 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
757 |
Changing only one file |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
758 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
759 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
760 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
761 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
762 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
763 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
764 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
765 |
> # Node ID 36454bda1fdb8e2e4fe07bb084eef378e29cba74 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
766 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
767 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
768 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
769 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
770 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
771 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
772 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
773 |
> +Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
774 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
775 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
776 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
777 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
778 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
779 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
780 |
file 'a' should be amended, rest of them should remain unchanged |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
781 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
782 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
783 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
784 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
785 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
786 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
787 |
# Node ID ea175dcc4ee38c106db157975e006b4092444c65 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
788 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
789 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
790 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
791 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
792 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
793 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
794 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
795 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
796 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
797 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
798 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
799 |
deleted file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
800 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
801 |
+++ /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
802 |
@@ -1,2 +0,0 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
803 |
-foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
804 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
805 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
806 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
807 |
? bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
808 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
809 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
810 |
$ hg diff |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
811 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
812 |
Testing again with file 'changedfile' |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
813 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
814 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
815 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
816 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
817 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
818 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
819 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
820 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
821 |
> # Node ID ea175dcc4ee38c106db157975e006b4092444c65 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
822 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
823 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
824 |
> diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
825 |
> --- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
826 |
> +++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
827 |
> @@ -1,2 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
828 |
> foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
829 |
> -babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
830 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
831 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
832 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
833 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
834 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
835 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
836 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
837 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
838 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
839 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
840 |
# Node ID 0e64d76c3519308c398a28192cb095d48b29aede |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
841 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
842 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
843 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
844 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
845 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
846 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
847 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
848 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
849 |
+Hello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
850 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
851 |
diff --git a/changedfile b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
852 |
--- a/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
853 |
+++ b/changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
854 |
@@ -1,2 +1,1 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
855 |
foobar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
856 |
-babar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
857 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
858 |
$ hg diff |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
859 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
860 |
? bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
861 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
862 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
863 |
Dropping a file from commit by removing related hunks |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
864 |
------------------------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
865 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
866 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
867 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
868 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
869 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
870 |
> # User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
871 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
872 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
873 |
> # Node ID 0e64d76c3519308c398a28192cb095d48b29aede |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
874 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
875 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
876 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
877 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
878 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
879 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
880 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
881 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
882 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
883 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
884 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
885 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
886 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
887 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
888 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
889 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
890 |
# User test |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
891 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
892 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
893 |
# Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
894 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
895 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
896 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
897 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
898 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
899 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
900 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
901 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
902 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
903 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
904 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
905 |
The part which was dropped from the patch will not be there in working directory |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
906 |
too |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
907 |
$ hg diff |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
908 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
909 |
$ hg status |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
910 |
? bar |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
911 |
? editor.sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
912 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
913 |
Changing metadata of a patch by editing patch content |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
914 |
====================================================== |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
915 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
916 |
Changing user |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
917 |
------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
918 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
919 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
920 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
921 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
922 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
923 |
> # User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
924 |
> # Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
925 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
926 |
> # Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
927 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
928 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
929 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
930 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
931 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
932 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
933 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
934 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
935 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
936 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
937 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
938 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
939 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
940 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
941 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
942 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
943 |
# User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
944 |
# Date 0 0 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
945 |
# Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
946 |
# Node ID 5ded18a8c333a55da4b0e051162457cfe5d85558 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
947 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
948 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
949 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
950 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
951 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
952 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
953 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
954 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
955 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
956 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
957 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
958 |
Changing Date |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
959 |
------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
960 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
961 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
962 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
963 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
964 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
965 |
> # User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
966 |
> # Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
967 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
968 |
> # Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
969 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
970 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
971 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
972 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
973 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
974 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
975 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
976 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
977 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
978 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
979 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
980 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
981 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
982 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
983 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
984 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
985 |
# User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
986 |
# Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
987 |
# Fri Jan 02 09:57:36 1970 -0020 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
988 |
# Node ID e2312ddcd8756665075a60bd05431ddca3c45050 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
989 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
990 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
991 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
992 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
993 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
994 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
995 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
996 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
997 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
998 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
999 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1000 |
Changing branch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1001 |
--------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1002 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1003 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1004 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1005 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1006 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1007 |
> # User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1008 |
> # Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1009 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1010 |
> # Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1011 |
> # Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1012 |
> # Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1013 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1014 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1015 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1016 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1017 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1018 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1019 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1020 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1021 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1022 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1023 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1024 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1025 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1026 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1027 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1028 |
# User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1029 |
# Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1030 |
# Fri Jan 02 09:57:36 1970 -0020 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1031 |
# Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1032 |
# Node ID ddc61a4058687b2dd4a316f4b5fe7d52a35b702a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1033 |
# Parent c3e29c061982c94418ce141d521434d6da76cd46 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1034 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1035 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1036 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1037 |
--- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1038 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1039 |
@@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1040 |
Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1041 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1042 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1043 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1044 |
Changing parent (this should be fun) |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1045 |
------------------------------------ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1046 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1047 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1048 |
@ 16:ddc61a405868 hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1049 |
| (foo) draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1050 |
o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1051 |
| () public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1052 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1053 |
() public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1054 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1055 |
$ hg log -r .^^ -T '{node}' |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1056 |
fc57c20be380f2878f4db139dad66d6cfb42ec62 (no-eol) |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1057 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1058 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1059 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1060 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1061 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1062 |
> # User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1063 |
> # Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1064 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1065 |
> # Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1066 |
> # Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1067 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1068 |
> hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1069 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1070 |
> --- a/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1071 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1072 |
> @@ -1,1 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1073 |
> Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1074 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1075 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1076 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1077 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1078 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1079 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1080 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1081 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1082 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1083 |
# User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1084 |
# Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1085 |
# Fri Jan 02 09:57:36 1970 -0020 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1086 |
# Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1087 |
# Node ID b763f7cb2302f2efa1275e2a9202655872c9567f |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1088 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1089 |
hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1090 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1091 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1092 |
new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1093 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1094 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1095 |
@@ -0,0 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1096 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1097 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1098 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1099 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1100 |
$ hg glog |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1101 |
@ 17:b763f7cb2302 hello to a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1102 |
| (foo) draft |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1103 |
| o 6:c3e29c061982 foobar to changedfile |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1104 |
|/ () public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1105 |
o 3:fc57c20be380 added a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1106 |
() public |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1107 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1108 |
Changing the commit desciption |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1109 |
------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1110 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1111 |
$ cat > editor.sh <<EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1112 |
> #!/bin/sh |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1113 |
> cat > \$1 <<ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1114 |
> # HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1115 |
> # User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1116 |
> # Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1117 |
> # Thu Jan 01 00:00:00 1970 +0000 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1118 |
> # Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1119 |
> # Node ID 944e9f65fa55fdb2de98577c9d8ab30de0927d8e |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1120 |
> # Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1121 |
> I am a message which is testing change of message |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1122 |
> diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1123 |
> new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1124 |
> --- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1125 |
> +++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1126 |
> @@ -0,0 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1127 |
> +Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1128 |
> +Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1129 |
> +betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1130 |
> ENDOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1131 |
> EOF |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1132 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1133 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1134 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1135 |
$ hg exp |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1136 |
# HG changeset patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1137 |
# User RandomUser |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1138 |
# Date 123456 1200 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1139 |
# Fri Jan 02 09:57:36 1970 -0020 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1140 |
# Branch stable |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1141 |
# Node ID f14ecd7121e63915ac93edbad7f60f605e62dd52 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1142 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1143 |
I am a message which is testing change of message |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1144 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1145 |
diff --git a/a b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1146 |
new file mode 100755 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1147 |
--- /dev/null |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1148 |
+++ b/a |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1149 |
@@ -0,0 +1,3 @@ |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1150 |
+Gello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1151 |
+Kello |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1152 |
+betto |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1153 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1154 |
Changing the Node ID of the patch |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1155 |
--------------------------------- |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1156 |
|
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1157 |
Nothing happens in that case we dont care about the node ID. Look the above 3-4 |
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1158 |
tests to realize I was testing that too. |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1159 |
|
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1160 |
Aborting by passing an empty patch file (issue5925) |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1161 |
--------------------------------------------------- |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1162 |
|
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1163 |
$ cat > editor.sh <<EOF |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1164 |
> #!/bin/sh |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1165 |
> cat > \$1 <<ENDOF |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1166 |
> ENDOF |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1167 |
> EOF |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1168 |
|
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1169 |
$ HGEDITOR="sh ./editor.sh" hg amend --patch |
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1170 |
abort: empty patch file, amend aborted |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1171 |
[255] |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1172 |
|
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1173 |
$ hg exp |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1174 |
# HG changeset patch |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1175 |
# User RandomUser |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1176 |
# Date 123456 1200 |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1177 |
# Fri Jan 02 09:57:36 1970 -0020 |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1178 |
# Branch stable |
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1179 |
# Node ID f14ecd7121e63915ac93edbad7f60f605e62dd52 |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1180 |
# Parent fc57c20be380f2878f4db139dad66d6cfb42ec62 |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1181 |
I am a message which is testing change of message |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1182 |
|
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1183 |
diff --git a/a b/a |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1184 |
new file mode 100755 |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1185 |
--- /dev/null |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1186 |
+++ b/a |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1187 |
@@ -0,0 +1,3 @@ |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1188 |
+Gello |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1189 |
+Kello |
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1190 |
+betto |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1191 |
|
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1192 |
$ hg parents |
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1193 |
changeset: 18:f14ecd7121e6 |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1194 |
branch: stable |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1195 |
bookmark: foo |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1196 |
tag: tip |
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1197 |
parent: 3:fc57c20be380 |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1198 |
user: RandomUser |
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1199 |
date: Fri Jan 02 09:57:36 1970 -0020 |
3877
96bbea985b25
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3876
diff
changeset
|
1200 |
summary: I am a message which is testing change of message |
3876
c464abfd7f9d
tests: add a test to demonstrate issue5925
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3661
diff
changeset
|
1201 |