author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Fri, 03 Aug 2018 00:19:47 +0200 | |
branch | mercurial-4.4 |
changeset 3935 | 9af0e2b0bdd7 |
parent 3660 | f018656ca3bf |
child 3715 | a77fb9669e99 |
child 4183 | 536c67823962 |
permissions | -rw-r--r-- |
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 |
> [extensions] |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 |
> EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1673
diff
changeset
|
4 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
|
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
6 |
$ glog() { |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2730
diff
changeset
|
7 |
> hg log -G --template '{rev}@{branch}({phase}) {desc|firstline}\n' "$@" |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
8 |
> } |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
9 |
|
630
722b52c75f02
compat: adapt to upstreaming of divergent logic
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
10 |
$ hg init repo --traceback |
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
$ cd repo |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 |
$ echo a > a |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 |
$ hg ci -Am adda |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 |
adding a |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
|
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
976
diff
changeset
|
16 |
Test that amend captures branches |
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 |
$ hg branch foo |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 |
marked working directory as branch foo |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 |
(branches are permanent and global, did you want a bookmark?) |
3221
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
21 |
$ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4" |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
385
diff
changeset
|
22 |
$ hg debugobsolete |
2578
7795a86ba326
effectflag: activate effect flag on test-amend.t test file
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
23 |
07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
3221
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
24 |
$ hg obslog |
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
25 |
@ 6a022cbb61d5 (1) adda |
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
26 |
| |
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
27 |
x 07f494440405 (0) adda |
3520
1f0c88a9dd1c
tests: commit tests changes missing in the previous changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3296
diff
changeset
|
28 |
rewritten(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3223
73b4e84df0bd
obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3221
diff
changeset
|
29 |
note: this a note on the obsmarker and supported for hg>=4.4 |
3221
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
30 |
|
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
31 |
$ hg branch |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
32 |
foo |
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
33 |
$ hg branches |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
34 |
foo 1:6a022cbb61d5 |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
35 |
$ glog |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
36 |
@ 1@foo(draft) adda |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
37 |
|
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
38 |
Test no-op |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
39 |
|
974
5808aad40aca
amend: in tests, do not rely on defaults -- always use explicit -d
Greg Ward <greg@gerg.ca>
parents:
742
diff
changeset
|
40 |
$ hg amend -d '0 0' |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
41 |
nothing changed |
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
42 |
[1] |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
43 |
$ glog |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
44 |
@ 1@foo(draft) adda |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
45 |
|
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
46 |
|
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
47 |
Test forcing the message to the same value, no intermediate revision. |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
48 |
|
974
5808aad40aca
amend: in tests, do not rely on defaults -- always use explicit -d
Greg Ward <greg@gerg.ca>
parents:
742
diff
changeset
|
49 |
$ hg amend -d '0 0' -m 'adda' |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
50 |
nothing changed |
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
51 |
[1] |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
52 |
$ glog |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
53 |
@ 1@foo(draft) adda |
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
54 |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
55 |
|
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
56 |
Test collapsing into an existing revision, no intermediate revision. |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
57 |
|
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
58 |
$ echo a >> a |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
59 |
$ hg ci -m changea |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
60 |
$ echo a > a |
445
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
61 |
$ hg status |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
62 |
M a |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
63 |
$ hg pstatus |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
64 |
$ hg diff |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
65 |
diff -r f7a50201fe3a a |
445
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
66 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
67 |
+++ b/a * +0000 (glob) |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
68 |
@@ -1,2 +1,1 @@ |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
69 |
a |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
70 |
-a |
52b5e14c63d5
obsolete: enforce pdiff and pstatus alias in the extension
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
444
diff
changeset
|
71 |
$ hg pdiff |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
72 |
$ hg ci -m reseta |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
385
diff
changeset
|
73 |
$ hg debugobsolete |
2578
7795a86ba326
effectflag: activate effect flag on test-amend.t test file
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
74 |
07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
75 |
$ hg phase 2 |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
76 |
2: draft |
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
77 |
$ glog |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
78 |
@ 3@foo(draft) reseta |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
79 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
80 |
o 2@foo(draft) changea |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
81 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
82 |
o 1@foo(draft) adda |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
83 |
|
975 | 84 |
Specify precise commit date with -d |
85 |
$ hg amend -d '2001-02-03 04:05:06 +0700' |
|
86 |
$ hg parents --template '{rev} {date|date}\n' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
87 |
4 Sat Feb 03 04:05:06 2001 +0700 |
265
24943df310d4
amend: do not traceback on no-ops
Patrick Mezard <patrick@mezard.eu>
parents:
263
diff
changeset
|
88 |
|
976
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
89 |
Specify "now" as commit date with -D |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
90 |
$ before=`date +%s` |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
91 |
$ hg amend -D |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
92 |
$ commit=`hg parents --template '{date|hgdate} rev{rev}\n'` |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
93 |
$ after=`date +%s` |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
94 |
$ (echo $before ; echo $commit; echo $after) | sort -k1 -n -s |
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
95 |
\d+ (re) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
96 |
\d+ 0 rev5 (re) |
976
bed842762447
amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents:
975
diff
changeset
|
97 |
\d+ (re) |
985
6a37044ec0b3
amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
98 |
|
6a37044ec0b3
amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
99 |
Specify current user as committer with -U |
6a37044ec0b3
amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
100 |
$ HGUSER=newbie hg amend -U |
6a37044ec0b3
amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca>
parents:
984
diff
changeset
|
101 |
$ hg parents --template '{rev} {author}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
102 |
6 newbie |
1140
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
103 |
|
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
104 |
Check that --logfile works |
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
105 |
$ echo "logfile message" > logfile.txt |
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
106 |
$ hg amend -l logfile.txt |
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
107 |
$ hg log -r . -T "{desc}\n" |
b7d85cd8ec7b
amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents:
1067
diff
changeset
|
108 |
logfile message |
1142
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
109 |
|
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
110 |
# Make sure we don't get reparented to -1 with no username (issue4211) |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
111 |
$ HGUSER= |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
112 |
$ hg amend -e --config ui.username= -m "empty user" |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
113 |
abort: no username supplied |
1673
8e879d59b20e
tests: change quoting pattern to match core's conventions
Laurent Charignon <lcharignon@fb.com>
parents:
1584
diff
changeset
|
114 |
(use 'hg config --edit' to set your username) |
1142
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
115 |
[255] |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
116 |
$ hg sum |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
117 |
parent: 7:* tip (glob) |
1142
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
118 |
logfile message |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
119 |
branch: foo |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
120 |
commit: 1 unknown (clean) |
9d85fd6e1474
test-amend: add a test for amend with no configured username (issue4211)
Matt Harbison <matt_harbison@yahoo.com>
parents:
1140
diff
changeset
|
121 |
update: (current) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1452
diff
changeset
|
122 |
phases: 3 draft |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
123 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
124 |
Check the help |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
125 |
$ hg amend -h |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
126 |
hg amend [OPTION]... [FILE]... |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
127 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
128 |
aliases: refresh |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
129 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
130 |
combine a changeset with updates and replace it with a new one |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
131 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
132 |
Commits a new changeset incorporating both the changes to the given files |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
133 |
and all the changes from the current parent changeset into the repository. |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
134 |
|
1584
190e4e526c66
tests: change some double quotes to single quotes
Martin von Zweigbergk <martinvonz@google.com>
parents:
1453
diff
changeset
|
135 |
See 'hg commit' for details about committing changes. |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
136 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
137 |
If you don't specify -m, the parent's message will be reused. |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
138 |
|
3296
b834cb64f779
amend: fix a typo in amend help text related to the extract option
Boris Feld <boris.feld@octobus.net>
parents:
3223
diff
changeset
|
139 |
If --extract is specified, the behavior of 'hg amend' is reversed: Changes |
2730
7fbb7a5d359f
uncommit: expose the feature with a '--extract' to amend
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2726
diff
changeset
|
140 |
to selected files in the checked out revision appear again as uncommitted |
7fbb7a5d359f
uncommit: expose the feature with a '--extract' to amend
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2726
diff
changeset
|
141 |
changed in the working directory. |
7fbb7a5d359f
uncommit: expose the feature with a '--extract' to amend
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2726
diff
changeset
|
142 |
|
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
143 |
Returns 0 on success, 1 if nothing changed. |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
144 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
145 |
options ([+] can be repeated): |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
146 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
147 |
-A --addremove mark new/missing files as added/removed before |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
148 |
committing |
2730
7fbb7a5d359f
uncommit: expose the feature with a '--extract' to amend
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2726
diff
changeset
|
149 |
-a --all match all files |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
150 |
-e --edit invoke editor on commit messages |
2730
7fbb7a5d359f
uncommit: expose the feature with a '--extract' to amend
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2726
diff
changeset
|
151 |
--extract extract changes from the commit to the working copy |
3660
f018656ca3bf
amend: add a new flag `--patch` to `hg amend`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3520
diff
changeset
|
152 |
--patch make changes to wdir parent by editing patch |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
153 |
--close-branch mark a branch as closed, hiding it from the branch |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
154 |
list |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
155 |
-s --secret use the secret phase for committing |
3221
9f3521cc4c90
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
156 |
-n --note VALUE store a note on amend |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
157 |
-I --include PATTERN [+] include names matching the given patterns |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
158 |
-X --exclude PATTERN [+] exclude names matching the given patterns |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
159 |
-m --message TEXT use text as commit message |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
160 |
-l --logfile FILE read commit message from file |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
161 |
-d --date DATE record the specified date as commit date |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
162 |
-u --user USER record the specified user as committer |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
163 |
-D --current-date record the current date as commit date |
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
164 |
-U --current-user record the current user as committer |
1452
1bcbd14cf159
merge back with 3.3 compat branch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1451
diff
changeset
|
165 |
-i --interactive use interactive mode |
1296
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
166 |
|
23819e1d61fd
evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents:
1185
diff
changeset
|
167 |
(some details hidden, use --verbose to show complete help) |