Mercurial > hg
annotate tests/test-commit-amend.t @ 35319:228916ca12b5
rebase: add concludememorynode(), and call it when rebasing in-memory
Differential Revision: https://phab.mercurial-scm.org/D1248
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Thu, 07 Dec 2017 22:35:43 -0800 |
parents | 98f97eb20597 |
children | 4441705b7111 |
rev | line source |
---|---|
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
1 $ cat << EOF >> $HGRCPATH |
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
2 > [format] |
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
3 > usegeneraldelta=yes |
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
4 > EOF |
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
5 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
6 $ hg init |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
7 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
8 Setup: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
9 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
10 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
11 $ hg ci -Am 'base' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
12 adding a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
13 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
14 Refuse to amend public csets: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
15 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
16 $ hg phase -r . -p |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
17 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
18 abort: cannot amend public changesets |
35244
98f97eb20597
rewriteutil: use precheck() in uncommit and amend commands
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34867
diff
changeset
|
19 (see 'hg help phases' for details) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
20 [255] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
21 $ hg phase -r . -f -d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
22 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
23 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
24 $ hg ci -Am 'base1' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
25 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
26 Nothing to amend: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
27 |
26750
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26614
diff
changeset
|
28 $ hg ci --amend -m 'base1' |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
29 nothing changed |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
30 [1] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
31 |
17060
69fa0459dd3b
test-commit-amend: adapt for Windows after fba17a64fa49
Adrian Buehlmann <adrian@cadifra.com>
parents:
17059
diff
changeset
|
32 $ cat >> $HGRCPATH <<EOF |
69fa0459dd3b
test-commit-amend: adapt for Windows after fba17a64fa49
Adrian Buehlmann <adrian@cadifra.com>
parents:
17059
diff
changeset
|
33 > [hooks] |
17462
8085fed2bf0a
tests: correct quoting of double quotes in here documents used to write hooks
Jim Hague <jim.hague@acm.org>
parents:
17461
diff
changeset
|
34 > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE" |
17060
69fa0459dd3b
test-commit-amend: adapt for Windows after fba17a64fa49
Adrian Buehlmann <adrian@cadifra.com>
parents:
17059
diff
changeset
|
35 > EOF |
17049
2440822446ce
amend: disable hooks when creating intermediate commit (issue3501)
Idan Kamara <idankk86@gmail.com>
parents:
16630
diff
changeset
|
36 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
37 Amending changeset with changes in working dir: |
17924
45bd0cd7ca04
amend: force editor only if old message is reused (issue3698)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17863
diff
changeset
|
38 (and check that --message does not trigger an editor) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
39 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
40 $ echo a >> a |
17924
45bd0cd7ca04
amend: force editor only if old message is reused (issue3698)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17863
diff
changeset
|
41 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
42 pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 |
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
43 43f1ba15f28a tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
44 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg (glob) |
17049
2440822446ce
amend: disable hooks when creating intermediate commit (issue3501)
Idan Kamara <idankk86@gmail.com>
parents:
16630
diff
changeset
|
45 $ echo 'pretxncommit.foo = ' >> $HGRCPATH |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
46 $ hg diff -c . |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
47 diff -r ad120869acf0 -r 43f1ba15f28a a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
48 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
49 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
50 @@ -1,1 +1,3 @@ |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
51 a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
30240
diff
changeset
|
52 +a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
53 +a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
54 $ hg log |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
55 changeset: 1:43f1ba15f28a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
56 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
57 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
58 date: Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
59 summary: amend base1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
60 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
61 changeset: 0:ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
62 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
63 date: Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
64 summary: base |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
65 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
66 |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
67 Check proper abort for empty message |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
68 |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
69 $ cat > editor.sh << '__EOF__' |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
70 > #!/bin/sh |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
71 > echo "" > "$1" |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
72 > __EOF__ |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
73 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
74 Update the existing file to ensure that the dirstate is not in pending state |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
75 (where the status of some files in the working copy is not known yet). This in |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
76 turn ensures that when the transaction is aborted due to an empty message during |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
77 the amend, there should be no rollback. |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
78 $ echo a >> a |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
79 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
80 $ echo b > b |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
81 $ hg add b |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
82 $ hg summary |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
83 parent: 1:43f1ba15f28a tip |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
84 amend base1 |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
85 branch: default |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
86 commit: 1 modified, 1 added, 1 unknown |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
87 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25295
diff
changeset
|
88 phases: 2 draft |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
89 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
90 abort: empty commit message |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
91 [255] |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
92 $ hg summary |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
93 parent: 1:43f1ba15f28a tip |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
94 amend base1 |
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
95 branch: default |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
96 commit: 1 modified, 1 added, 1 unknown |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
97 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25295
diff
changeset
|
98 phases: 2 draft |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
99 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
100 Add new file along with modified existing file: |
18197
153659e86a5f
amend: invalidate dirstate in case of failure (issue3670)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
101 $ hg ci --amend -m 'amend base1 new file' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
102 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
103 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
104 Remove file that was added in amended commit: |
17863
034e55bbf7c0
amend: fix incompatibity between logfile and message option (issue3675)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17811
diff
changeset
|
105 (and test logfile option) |
17924
45bd0cd7ca04
amend: force editor only if old message is reused (issue3698)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17863
diff
changeset
|
106 (and test that logfile option do not trigger an editor) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
107 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
108 $ hg rm b |
17863
034e55bbf7c0
amend: fix incompatibity between logfile and message option (issue3675)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17811
diff
changeset
|
109 $ echo 'amend base1 remove new file' > ../logfile |
17924
45bd0cd7ca04
amend: force editor only if old message is reused (issue3698)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17863
diff
changeset
|
110 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
111 saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
112 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
113 $ hg cat b |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
114 b: no such file in rev 47343646fa3d |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
115 [1] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
116 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
117 No changes, just a different message: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
118 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
119 $ hg ci -v --amend -m 'no changes, new message' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
120 amending changeset 47343646fa3d |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
121 copying changeset 47343646fa3d to ad120869acf0 |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
122 committing files: |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
123 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
124 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
125 committing changelog |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
126 1 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23589
diff
changeset
|
127 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30062
diff
changeset
|
128 254 (changelog) |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
129 163 (manifests) |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
130 131 a |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
131 saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
132 1 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23589
diff
changeset
|
133 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30062
diff
changeset
|
134 250 (changelog) |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
135 163 (manifests) |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
136 131 a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
137 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
138 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
139 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
140 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
141 added 1 changesets with 1 changes to 1 files |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
142 committed changeset 1:401431e913a1 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
143 $ hg diff -c . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
144 diff -r ad120869acf0 -r 401431e913a1 a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
145 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
146 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
147 @@ -1,1 +1,4 @@ |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
148 a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
30240
diff
changeset
|
149 +a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
150 +a |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
151 +a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
152 $ hg log |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
153 changeset: 1:401431e913a1 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
154 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
155 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
156 date: Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
157 summary: no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
158 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
159 changeset: 0:ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
160 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
161 date: Thu Jan 01 00:00:00 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
162 summary: base |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
163 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
164 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
165 Disable default date on commit so when -d isn't given, the old date is preserved: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
166 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
167 $ echo '[defaults]' >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
168 $ echo 'commit=' >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
169 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
170 Test -u/-d: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
171 |
22249
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
172 $ cat > .hg/checkeditform.sh <<EOF |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
173 > env | grep HGEDITFORM |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
174 > true |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
175 > EOF |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
176 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0' |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
177 HGEDITFORM=commit.amend.normal |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
178 saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
179 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
180 $ hg ci --amend -u foo -d '1 0' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
181 saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
182 $ hg log -r . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
183 changeset: 1:a9a13940fc03 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
184 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
185 user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
186 date: Thu Jan 01 00:00:01 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
187 summary: no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
188 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
189 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
190 Open editor with old commit message if a message isn't given otherwise: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
191 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
192 $ cat > editor.sh << '__EOF__' |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
193 > #!/bin/sh |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
194 > cat $1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
195 > echo "another precious commit message" > "$1" |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
196 > __EOF__ |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
197 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
198 at first, test saving last-message.txt |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
199 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
200 $ cat > .hg/hgrc << '__EOF__' |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
201 > [hooks] |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
202 > pretxncommit.test-saving-last-message = false |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
203 > __EOF__ |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
204 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
205 $ rm -f .hg/last-message.txt |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
206 $ hg commit --amend -v -m "message given from command line" |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
207 amending changeset a9a13940fc03 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
208 copying changeset a9a13940fc03 to ad120869acf0 |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
209 committing files: |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
210 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
211 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
212 committing changelog |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
213 running hook pretxncommit.test-saving-last-message: false |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
214 transaction abort! |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
215 rollback completed |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
216 abort: pretxncommit.test-saving-last-message hook exited with status 1 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
217 [255] |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
218 $ cat .hg/last-message.txt |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
219 message given from command line (no-eol) |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
220 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
221 $ rm -f .hg/last-message.txt |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
222 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
223 amending changeset a9a13940fc03 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
224 copying changeset a9a13940fc03 to ad120869acf0 |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
225 no changes, new message |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
226 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
227 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
228 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
229 HG: Leave message empty to abort commit. |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
230 HG: -- |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
231 HG: user: foo |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
232 HG: branch 'default' |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
233 HG: changed a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
234 committing files: |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
235 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
236 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
237 committing changelog |
20771
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
238 running hook pretxncommit.test-saving-last-message: false |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
239 transaction abort! |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
240 rollback completed |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
241 abort: pretxncommit.test-saving-last-message hook exited with status 1 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
242 [255] |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
243 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
244 $ cat .hg/last-message.txt |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
245 another precious commit message |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
246 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
247 $ cat > .hg/hgrc << '__EOF__' |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
248 > [hooks] |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
249 > pretxncommit.test-saving-last-message = |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
250 > __EOF__ |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
251 |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
252 then, test editing custom commit message |
434619dae569
amend: save commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20700
diff
changeset
|
253 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
254 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
255 amending changeset a9a13940fc03 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
256 copying changeset a9a13940fc03 to ad120869acf0 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
257 no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
258 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
259 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
260 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
261 HG: Leave message empty to abort commit. |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
262 HG: -- |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
263 HG: user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
264 HG: branch 'default' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
265 HG: changed a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
266 committing files: |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
267 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
268 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
269 committing changelog |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
270 1 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23589
diff
changeset
|
271 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30062
diff
changeset
|
272 249 (changelog) |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
273 163 (manifests) |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
274 133 a |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
275 saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
276 1 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23589
diff
changeset
|
277 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30062
diff
changeset
|
278 257 (changelog) |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
279 163 (manifests) |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
280 133 a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
281 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
282 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
283 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
284 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
285 added 1 changesets with 1 changes to 1 files |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
286 committed changeset 1:64a124ba1b44 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
287 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
288 Same, but with changes in working dir (different code path): |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
289 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
290 $ echo a >> a |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
291 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
292 amending changeset 64a124ba1b44 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
293 another precious commit message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
294 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
295 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
296 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
297 HG: Leave message empty to abort commit. |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
298 HG: -- |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
299 HG: user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
300 HG: branch 'default' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
301 HG: changed a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
302 committing files: |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
303 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
304 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
305 committing changelog |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
306 1 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23589
diff
changeset
|
307 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30062
diff
changeset
|
308 257 (changelog) |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
309 163 (manifests) |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
310 133 a |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
311 saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg (glob) |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
312 1 changesets found |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
313 uncompressed size of bundle content: |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
314 257 (changelog) |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
315 163 (manifests) |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
316 135 a |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
317 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
318 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
319 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
320 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
321 added 1 changesets with 1 changes to 1 files |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
322 committed changeset 1:7892795b8e38 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
323 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
324 $ rm editor.sh |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
325 $ hg log -r . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
326 changeset: 1:7892795b8e38 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
327 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
328 user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
329 date: Thu Jan 01 00:00:01 1970 +0000 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
330 summary: another precious commit message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
331 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
332 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
333 Moving bookmarks, preserve active bookmark: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
334 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
335 $ hg book book1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
336 $ hg book book2 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
337 $ hg ci --amend -m 'move bookmarks' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
338 saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
339 $ hg book |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
340 book1 1:8311f17e2616 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
341 * book2 1:8311f17e2616 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
342 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
343 $ hg ci --amend -m 'move bookmarks' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
344 saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
345 $ hg book |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
346 book1 1:a3b65065808c |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
347 * book2 1:a3b65065808c |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
348 |
18198
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
349 abort does not loose bookmarks |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
350 |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
351 $ cat > editor.sh << '__EOF__' |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
352 > #!/bin/sh |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
353 > echo "" > "$1" |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
354 > __EOF__ |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
355 $ echo a >> a |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
356 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
357 abort: empty commit message |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
358 [255] |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
359 $ hg book |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
360 book1 1:a3b65065808c |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
361 * book2 1:a3b65065808c |
18198
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
362 $ hg revert -Caq |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
363 $ rm editor.sh |
9b4adaef0db9
amend: prevent loss of bookmark on failed amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18197
diff
changeset
|
364 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
365 $ echo '[defaults]' >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
366 $ echo "commit=-d '0 0'" >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
367 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
368 Moving branches: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
369 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
370 $ hg branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
371 marked working directory as branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
372 (branches are permanent and global, did you want a bookmark?) |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
373 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
374 $ hg ci -m 'branch foo' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
375 $ hg branch default -f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
376 marked working directory as branch default |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
377 $ hg ci --amend -m 'back to default' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
378 saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
379 $ hg branches |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
380 default 2:9c07515f2650 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
381 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
382 Close branch: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
383 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
384 $ hg up -q 0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
385 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
386 $ hg branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
387 marked working directory as branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
388 (branches are permanent and global, did you want a bookmark?) |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
389 $ hg ci -Am 'fork' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
390 adding b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
391 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
392 $ hg ci -mb |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
393 $ hg ci --amend --close-branch -m 'closing branch foo' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
394 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
395 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
396 Same thing, different code path: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
397 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
398 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
399 $ hg ci -m 'reopen branch' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
400 reopening closed branch head 4 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
401 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
402 $ hg ci --amend --close-branch |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
403 saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg (glob) |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
404 $ hg branches |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
405 default 2:9c07515f2650 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
406 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
407 Refuse to amend during a merge: |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
408 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
409 $ hg up -q default |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
410 $ hg merge foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
411 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
412 (branch merge, don't forget to commit) |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
413 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
414 abort: cannot amend while merging |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
415 [255] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
416 $ hg ci -m 'merge' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
417 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
418 Follow copies/renames: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
419 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
420 $ hg mv b c |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
421 $ hg ci -m 'b -> c' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
422 $ hg mv c d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
423 $ hg ci --amend -m 'b -> d' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
424 saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg (glob) |
16483
3c4910364797
tests: ^ must be quoted when used on solaris sh
Mads Kiilerich <mads@kiilerich.com>
parents:
16458
diff
changeset
|
425 $ hg st --rev '.^' --copies d |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
426 A d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
427 b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
428 $ hg cp d e |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
429 $ hg ci -m 'e = d' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
430 $ hg cp e f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
431 $ hg ci --amend -m 'f = d' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
432 saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg (glob) |
16483
3c4910364797
tests: ^ must be quoted when used on solaris sh
Mads Kiilerich <mads@kiilerich.com>
parents:
16458
diff
changeset
|
433 $ hg st --rev '.^' --copies f |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
434 A f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
435 d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
436 |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
437 $ mv f f.orig |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
438 $ hg rm -A f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
439 $ hg ci -m removef |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
440 $ hg cp a f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
441 $ mv f.orig f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
442 $ hg ci --amend -m replacef |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
443 saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg (glob) |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
444 $ hg st --change . --copies |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
445 $ hg log -r . --template "{file_copies}\n" |
16553
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
446 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
447 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
448 Move added file (issue3410): |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
449 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
450 $ echo g >> g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
451 $ hg ci -Am g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
452 adding g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
453 $ hg mv g h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
454 $ hg ci --amend |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
455 saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg (glob) |
16553
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
456 $ hg st --change . --copies h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
457 A h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
458 $ hg log -r . --template "{file_copies}\n" |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
459 |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
460 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
461 Can't rollback an amend: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
462 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
463 $ hg rollback |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
464 no rollback information available |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
465 [1] |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
466 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
467 Preserve extra dict (issue3430): |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
468 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
469 $ hg branch a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
470 marked working directory as branch a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
471 (branches are permanent and global, did you want a bookmark?) |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
472 $ echo a >> a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
473 $ hg ci -ma |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
474 $ hg ci --amend -m "a'" |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
475 saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg (glob) |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
476 $ hg log -r . --template "{branch}\n" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
477 a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
478 $ hg ci --amend -m "a''" |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
479 saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg (glob) |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
480 $ hg log -r . --template "{branch}\n" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
481 a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
482 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
483 Also preserve other entries in the dict that are in the old commit, |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
484 first graft something so there's an additional entry: |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
485 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
486 $ hg up 0 -q |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
487 $ echo z > z |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
488 $ hg ci -Am 'fork' |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
489 adding z |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
490 created new head |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
491 $ hg up 11 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
492 5 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
493 $ hg graft 12 |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23139
diff
changeset
|
494 grafting 12:2647734878ef "fork" (tip) |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
495 $ hg ci --amend -m 'graft amend' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
496 saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg (glob) |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
497 $ hg log -r . --debug | grep extra |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
498 extra: amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60 |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
499 extra: branch=a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
500 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a |
17461
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
501 |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
502 Preserve phase |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
503 |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
504 $ hg phase '.^::.' |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
505 11: draft |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
506 13: draft |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
507 $ hg phase --secret --force . |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
508 $ hg phase '.^::.' |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
509 11: draft |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
510 13: secret |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
511 $ hg commit --amend -m 'amend for phase' -q |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
512 $ hg phase '.^::.' |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
513 11: draft |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
514 13: secret |
bacde764fba0
amend: preserve phase of amended revision (issue3602)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17060
diff
changeset
|
515 |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
516 Test amend with obsolete |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
517 --------------------------- |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
518 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
519 Enable obsolete |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
520 |
22956
a0f89c852a0c
obsolete: update test-commit-amend to use obsolete option
Durham Goode <durham@fb.com>
parents:
22249
diff
changeset
|
521 $ cat >> $HGRCPATH << EOF |
a0f89c852a0c
obsolete: update test-commit-amend to use obsolete option
Durham Goode <durham@fb.com>
parents:
22249
diff
changeset
|
522 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34085
diff
changeset
|
523 > evolution.createmarkers=True |
34867
7f183c643eb6
config: use 'experimental.evolution.allowunstable'
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
524 > evolution.allowunstable=True |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
525 > EOF |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
526 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
527 Amend with no files changes |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
528 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
529 $ hg id -n |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
530 13 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
531 $ hg ci --amend -m 'babar' |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
532 $ hg id -n |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
533 14 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
534 $ hg log -Gl 3 --style=compact |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
535 @ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
536 | babar |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
537 | |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
538 | o 12:0 2647734878ef 1970-01-01 00:00 +0000 test |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
539 | | fork |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
540 | ~ |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
541 o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
542 | a'' |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
543 ~ |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
544 $ hg log -Gl 4 --hidden --style=compact |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
545 @ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
546 | babar |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
547 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
548 | x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
549 |/ amend for phase |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
550 | |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
551 | o 12:0 2647734878ef 1970-01-01 00:00 +0000 test |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
552 | | fork |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
553 | ~ |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
554 o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
555 | a'' |
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
556 ~ |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
557 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
558 Amend with files changes |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
559 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
560 (note: the extra commit over 15 is a temporary junk I would be happy to get |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
561 ride of) |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
562 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
563 $ echo 'babar' >> a |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
564 $ hg commit --amend |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
565 $ hg log -Gl 6 --hidden --style=compact |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
566 @ 15[tip]:11 a5b42b49b0d5 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
567 | babar |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
568 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
569 | x 14:11 682950e85999 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
570 |/ babar |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
571 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
572 | x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
573 |/ amend for phase |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
574 | |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
575 | o 12:0 2647734878ef 1970-01-01 00:00 +0000 test |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
576 | | fork |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
577 | ~ |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
578 o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
579 | a'' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
580 | |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
581 o 10 5fa75032e226 1970-01-01 00:00 +0000 test |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
582 | g |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
27597
diff
changeset
|
583 ~ |
17475
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
584 |
63e45aee46d4
amend: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17473
diff
changeset
|
585 |
18399
66cec3c2ee00
tests: more comment cleanup related to obsolescence
Kevin Bullock <kbullock@ringworld.org>
parents:
18398
diff
changeset
|
586 Test that amend does not make it easy to create obsolescence cycle |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
587 --------------------------------------------------------------------- |
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
588 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18206
diff
changeset
|
589 $ hg id -r 14 --hidden |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
590 682950e85999 (a) |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18206
diff
changeset
|
591 $ hg revert -ar 14 --hidden |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
592 reverting a |
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
593 $ hg commit --amend |
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17475
diff
changeset
|
594 $ hg id |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
595 37973c7e0b61 (a) tip |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
596 |
18398
1a00c8451640
test: fix in-test comments related to obsolescence
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18267
diff
changeset
|
597 Test that rewriting leaving instability behind is allowed |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
598 --------------------------------------------------------------------- |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
599 |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
600 $ hg up '.^' |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
601 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
602 $ echo 'b' >> a |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
603 $ hg log --style compact -r 'children(.)' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
604 16[tip]:11 37973c7e0b61 1970-01-01 00:00 +0000 test |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
605 babar |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
606 |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
607 $ hg commit --amend |
33774
9dcc3529e002
revset: rename unstable into orphan
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
608 $ hg log -r 'orphan()' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
609 changeset: 16:37973c7e0b61 |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
610 branch: a |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
611 parent: 11:0ddb275cfad1 |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
612 user: test |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
613 date: Thu Jan 01 00:00:00 1970 +0000 |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33666
diff
changeset
|
614 instability: orphan |
18163
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
615 summary: babar |
c5bd753c5bc6
amend: allow amend of non-head when obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17924
diff
changeset
|
616 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
617 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
618 Amend a merge changeset (with renames and conflicts from the second parent): |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
619 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
620 $ hg up -q default |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
621 $ hg branch -q bar |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
622 $ hg cp a aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
623 $ hg mv z zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
624 $ echo cc > cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
625 $ hg add cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
626 $ hg ci -m aazzcc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
627 $ hg up -q default |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
628 $ echo a >> a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
629 $ echo dd > cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
630 $ hg add cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
631 $ hg ci -m aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
632 $ hg merge -q bar |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25393
diff
changeset
|
633 warning: conflicts while merging cc! (edit, then use 'hg resolve --mark') |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
634 [1] |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
635 $ hg resolve -m cc |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
636 (no more unresolved files) |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
637 $ hg ci -m 'merge bar' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
638 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
639 changeset: 20:163cfd7219f7 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
640 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
641 parent: 19:30d96aeaf27b |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
642 parent: 18:1aa437659d19 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
643 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
644 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
645 summary: merge bar |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
646 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
647 diff --git a/a b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
648 copy from a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
649 copy to aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
650 diff --git a/cc b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
651 --- a/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
652 +++ b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
653 @@ -1,1 +1,5 @@ |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
654 +<<<<<<< working copy: 30d96aeaf27b - test: aa |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
655 dd |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
656 +======= |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
657 +cc |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
658 +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
659 diff --git a/z b/zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
660 rename from z |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
661 rename to zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
662 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
663 $ hg debugrename aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
664 aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
665 $ hg debugrename zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
666 zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
667 $ hg debugrename cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
668 cc not renamed |
22249
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
669 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit |
f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21947
diff
changeset
|
670 HGEDITFORM=commit.amend.merge |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
671 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
672 changeset: 21:bca52d4ed186 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
673 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
674 parent: 19:30d96aeaf27b |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
675 parent: 18:1aa437659d19 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
676 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
677 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
678 summary: merge bar (amend message) |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
679 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
680 diff --git a/a b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
681 copy from a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
682 copy to aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
683 diff --git a/cc b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
684 --- a/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
685 +++ b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
686 @@ -1,1 +1,5 @@ |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
687 +<<<<<<< working copy: 30d96aeaf27b - test: aa |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
688 dd |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
689 +======= |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
690 +cc |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
691 +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
692 diff --git a/z b/zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
693 rename from z |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
694 rename to zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
695 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
696 $ hg debugrename aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
697 aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
698 $ hg debugrename zz |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
699 zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
700 $ hg debugrename cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
701 cc not renamed |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
702 $ hg mv zz z |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
703 $ hg ci --amend -m 'merge bar (undo rename)' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
704 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
705 changeset: 22:12594a98ca3f |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
706 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
707 parent: 19:30d96aeaf27b |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
708 parent: 18:1aa437659d19 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
709 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
710 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
711 summary: merge bar (undo rename) |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
712 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
713 diff --git a/a b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
714 copy from a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
715 copy to aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
716 diff --git a/cc b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
717 --- a/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
718 +++ b/cc |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
719 @@ -1,1 +1,5 @@ |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
720 +<<<<<<< working copy: 30d96aeaf27b - test: aa |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
721 dd |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
722 +======= |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
723 +cc |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
724 +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
725 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
726 $ hg debugrename z |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
727 z not renamed |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
728 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
729 Amend a merge changeset (with renames during the merge): |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
730 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
731 $ hg up -q bar |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
732 $ echo x > x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
733 $ hg add x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
734 $ hg ci -m x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
735 $ hg up -q default |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
736 $ hg merge -q bar |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
737 $ hg mv aa aaa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
738 $ echo aa >> aaa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
739 $ hg ci -m 'merge bar again' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
740 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
741 changeset: 24:dffde028b388 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
742 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
743 parent: 22:12594a98ca3f |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
744 parent: 23:4c94d5bc65f5 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
745 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
746 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
747 summary: merge bar again |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
748 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
749 diff --git a/aa b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
750 deleted file mode 100644 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
751 --- a/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
752 +++ /dev/null |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
753 @@ -1,2 +0,0 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
754 -a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
755 -a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
756 diff --git a/aaa b/aaa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
757 new file mode 100644 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
758 --- /dev/null |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
759 +++ b/aaa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
760 @@ -0,0 +1,3 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
761 +a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
762 +a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
763 +aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
764 diff --git a/x b/x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
765 new file mode 100644 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
766 --- /dev/null |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
767 +++ b/x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
768 @@ -0,0 +1,1 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
769 +x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
770 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
771 $ hg debugrename aaa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
772 aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
773 $ hg mv aaa aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
774 $ hg ci --amend -m 'merge bar again (undo rename)' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
775 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
776 changeset: 25:18e3ba160489 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
777 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
778 parent: 22:12594a98ca3f |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
779 parent: 23:4c94d5bc65f5 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
780 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
781 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
782 summary: merge bar again (undo rename) |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
783 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
784 diff --git a/aa b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
785 --- a/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
786 +++ b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
787 @@ -1,2 +1,3 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
788 a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
789 a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
790 +aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
791 diff --git a/x b/x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
792 new file mode 100644 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
793 --- /dev/null |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
794 +++ b/x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
795 @@ -0,0 +1,1 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
796 +x |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
797 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
798 $ hg debugrename aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
799 aa not renamed |
18912
4e1ae55e63ef
test-commit-amend.t: fix check-code violation from 3a72c89a83ec
Augie Fackler <raf@durin42.com>
parents:
18909
diff
changeset
|
800 $ hg debugrename -r '.^' aa |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
801 aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
802 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
803 Amend a merge changeset (with manifest-level conflicts): |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
804 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
805 $ hg up -q bar |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
806 $ hg rm aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
807 $ hg ci -m 'rm aa' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
808 $ hg up -q default |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
809 $ echo aa >> aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
810 $ hg ci -m aa |
27597
fe150586d9bd
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
811 $ hg merge -q bar --config ui.interactive=True << EOF |
fe150586d9bd
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
812 > c |
fe150586d9bd
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
813 > EOF |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
814 local [working copy] changed aa which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26927
diff
changeset
|
815 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
816 $ hg ci -m 'merge bar (with conflicts)' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
817 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
818 changeset: 28:b4c3035e2544 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
819 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
820 parent: 27:4b216ca5ba97 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
821 parent: 26:67db8847a540 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
822 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
823 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
824 summary: merge bar (with conflicts) |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
825 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
826 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
827 $ hg rm aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
828 $ hg ci --amend -m 'merge bar (with conflicts, amended)' |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
829 $ hg log --config diff.git=1 -pr . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
830 changeset: 29:1205ed810051 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
831 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
832 parent: 27:4b216ca5ba97 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
833 parent: 26:67db8847a540 |
18909
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
834 user: test |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
835 date: Thu Jan 01 00:00:00 1970 +0000 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
836 summary: merge bar (with conflicts, amended) |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
837 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
838 diff --git a/aa b/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
839 deleted file mode 100644 |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
840 --- a/aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
841 +++ /dev/null |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
842 @@ -1,4 +0,0 @@ |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
843 -a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
844 -a |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
845 -aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
846 -aa |
3a72c89a83ec
amend: support amending merge changesets (issue3778)
Brodie Rao <brodie@sf.io>
parents:
18399
diff
changeset
|
847 |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
848 Issue 3445: amending with --close-branch a commit that created a new head should fail |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
849 This shouldn't be possible: |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
850 |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
851 $ hg up -q default |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
852 $ hg branch closewithamend |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
853 marked working directory as branch closewithamend |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
854 $ echo foo > foo |
22956
a0f89c852a0c
obsolete: update test-commit-amend to use obsolete option
Durham Goode <durham@fb.com>
parents:
22249
diff
changeset
|
855 $ hg add foo |
19980
0151b61fed97
test: do not add .pyc and .orig in test-commit-amend.t (issue4085)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19305
diff
changeset
|
856 $ hg ci -m.. |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
857 $ hg ci --amend --close-branch -m 'closing' |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
858 abort: can only close branch heads |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
859 [255] |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
860 |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
861 This silliness fails: |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
862 |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
863 $ hg branch silliness |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
864 marked working directory as branch silliness |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
865 $ echo b >> b |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
866 $ hg ci --close-branch -m'open and close' |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
867 abort: can only close branch heads |
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
18912
diff
changeset
|
868 [255] |
20700
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
869 |
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
870 Test that amend with --secret creates new secret changeset forcibly |
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
871 --------------------------------------------------------------------- |
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
872 |
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
873 $ hg phase '.^::.' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
874 29: draft |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
875 30: draft |
20700
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
876 $ hg commit --amend --secret -m 'amend as secret' -q |
b0153cb8b64e
commit: create new amend changeset as secret correctly for "--secret" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19980
diff
changeset
|
877 $ hg phase '.^::.' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
878 29: draft |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
879 31: secret |
21036
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
880 |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
881 Test that amend with --edit invokes editor forcibly |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
882 --------------------------------------------------- |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
883 |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
884 $ hg parents --template "{desc}\n" |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
885 amend as secret |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
886 $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed" |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
887 $ hg parents --template "{desc}\n" |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
888 editor should be suppressed |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
889 |
23587
8063901e56cd
memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23505
diff
changeset
|
890 $ hg status --rev '.^1::.' |
8063901e56cd
memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23505
diff
changeset
|
891 A foo |
21036
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
892 $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
893 editor should be invoked |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
894 |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
895 |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
896 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
897 HG: Leave message empty to abort commit. |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
898 HG: -- |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
899 HG: user: test |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
900 HG: branch 'silliness' |
23587
8063901e56cd
memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23505
diff
changeset
|
901 HG: added foo |
21036
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
902 $ hg parents --template "{desc}\n" |
a1a1bd09e4f4
amend: invoke editor forcibly when "--edit" option is specified
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20771
diff
changeset
|
903 editor should be invoked |
23071
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
904 |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
905 Test that "diff()" in committemplate works correctly for amending |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
906 ----------------------------------------------------------------- |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
907 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
908 $ cat >> .hg/hgrc <<EOF |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
909 > [committemplate] |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
910 > changeset.commit.amend = {desc}\n |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
911 > HG: M: {file_mods} |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
912 > HG: A: {file_adds} |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
913 > HG: R: {file_dels} |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
914 > {splitlines(diff()) % 'HG: {line}\n'} |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
915 > EOF |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
916 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
917 $ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n" |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
918 M: |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
919 A: foo |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
920 R: |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
921 $ hg status -amr |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
922 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo" |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
923 expecting diff of foo |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
924 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
925 HG: M: |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
926 HG: A: foo |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
927 HG: R: |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
928 HG: diff -r 1205ed810051 foo |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
929 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
930 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
931 HG: @@ -0,0 +1,1 @@ |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
932 HG: +foo |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
933 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
934 $ echo y > y |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
935 $ hg add y |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
936 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y" |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
937 expecting diff of foo and y |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
938 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
939 HG: M: |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
940 HG: A: foo y |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
941 HG: R: |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
942 HG: diff -r 1205ed810051 foo |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
943 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
944 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
945 HG: @@ -0,0 +1,1 @@ |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
946 HG: +foo |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
947 HG: diff -r 1205ed810051 y |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
948 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
949 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
950 HG: @@ -0,0 +1,1 @@ |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
951 HG: +y |
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
952 |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
953 $ hg rm a |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
954 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y" |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
955 expecting diff of a, foo and y |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
956 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
957 HG: M: |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
958 HG: A: foo y |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
959 HG: R: a |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
960 HG: diff -r 1205ed810051 a |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
961 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
962 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
963 HG: @@ -1,2 +0,0 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
964 HG: -a |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
965 HG: -a |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
966 HG: diff -r 1205ed810051 foo |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
967 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
968 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
969 HG: @@ -0,0 +1,1 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
970 HG: +foo |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
971 HG: diff -r 1205ed810051 y |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
972 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
973 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
974 HG: @@ -0,0 +1,1 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
975 HG: +y |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
976 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
977 $ hg rm x |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
978 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y" |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
979 expecting diff of a, foo, x and y |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
980 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
981 HG: M: |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
982 HG: A: foo y |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
983 HG: R: a x |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
984 HG: diff -r 1205ed810051 a |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
985 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
986 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
987 HG: @@ -1,2 +0,0 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
988 HG: -a |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
989 HG: -a |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
990 HG: diff -r 1205ed810051 foo |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
991 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
992 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
993 HG: @@ -0,0 +1,1 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
994 HG: +foo |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
995 HG: diff -r 1205ed810051 x |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
996 HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
997 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
998 HG: @@ -1,1 +0,0 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
999 HG: -x |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
1000 HG: diff -r 1205ed810051 y |
23589
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
1001 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
1002 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
1003 HG: @@ -0,0 +1,1 @@ |
200215cdf7aa
memctx: calculate manifest correctly with newly-removed files (issue4470)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23588
diff
changeset
|
1004 HG: +y |
23588
87a76cff7147
memctx: calculate manifest including newly added files correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23587
diff
changeset
|
1005 |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1006 $ echo cccc >> cc |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1007 $ hg status -amr |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1008 M cc |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1009 $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1010 cc should be excluded |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1011 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1012 HG: M: |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1013 HG: A: foo y |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1014 HG: R: a x |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
1015 HG: diff -r 1205ed810051 a |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1016 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1017 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1018 HG: @@ -1,2 +0,0 @@ |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1019 HG: -a |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1020 HG: -a |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
1021 HG: diff -r 1205ed810051 foo |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1022 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1023 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1024 HG: @@ -0,0 +1,1 @@ |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1025 HG: +foo |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
1026 HG: diff -r 1205ed810051 x |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1027 HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1028 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1029 HG: @@ -1,1 +0,0 @@ |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1030 HG: -x |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30432
diff
changeset
|
1031 HG: diff -r 1205ed810051 y |
25392
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1032 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1033 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1034 HG: @@ -0,0 +1,1 @@ |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1035 HG: +y |
ed18f4acf435
templatekw: compare target context and its parent exactly (issue4690)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24229
diff
changeset
|
1036 |
23071
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1037 Check for issue4405 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1038 ------------------- |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1039 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1040 Setup the repo with a file that gets moved in a second commit. |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1041 $ hg init repo |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1042 $ cd repo |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1043 $ touch a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1044 $ hg add a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1045 $ hg commit -m a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1046 $ hg mv a0 a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1047 $ hg commit -m a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1048 $ hg up -q 0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1049 $ hg log -G --template '{rev} {desc}' |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1050 o 1 a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1051 | |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1052 @ 0 a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1053 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1054 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1055 Now we branch the repro, but re-use the file contents, so we have a divergence |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1056 in the file revlog topology and the changelog topology. |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1057 $ hg revert --rev 1 --all |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1058 removing a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1059 adding a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1060 $ hg ci -qm 'a1-amend' |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1061 $ hg log -G --template '{rev} {desc}' |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1062 @ 2 a1-amend |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1063 | |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1064 | o 1 a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1065 |/ |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1066 o 0 a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1067 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1068 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1069 The way mercurial does amends is by folding the working copy and old commit |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1070 together into another commit (rev 3). During this process, _findlimit is called |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1071 to check how far back to look for the transitive closure of file copy |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1072 information, but due to the divergence of the filelog and changelog graph |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1073 topologies, before _findlimit was fixed, it returned a rev which was not far |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1074 enough back in this case. |
23071
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1075 $ hg mv a1 a2 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1076 $ hg status --copies --rev 0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1077 A a2 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1078 a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1079 R a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1080 $ hg ci --amend -q |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1081 $ hg log -G --template '{rev} {desc}' |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1082 @ 3 a1-amend |
23071
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1083 | |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1084 | o 1 a1 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1085 |/ |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1086 o 0 a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1087 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1088 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1089 Before the fix, the copy information was lost. |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1090 $ hg status --copies --rev 0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1091 A a2 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1092 a0 |
652ab726ba93
amend: fix amending rename commit with diverged topologies (issue4405)
Ryan McElroy <rmcelroy@fb.com>
parents:
22956
diff
changeset
|
1093 R a0 |
24169
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1094 $ cd .. |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1095 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1096 Check that amend properly preserve rename from directory rename (issue-4516) |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1097 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1098 If a parent of the merge renames a full directory, any files added to the old |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1099 directory in the other parent will be renamed to the new directory. For some |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1100 reason, the rename metadata was when amending such merge. This test ensure we |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1101 do not regress. We have a dedicated repo because it needs a setup with renamed |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1102 directory) |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1103 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1104 $ hg init issue4516 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1105 $ cd issue4516 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1106 $ mkdir olddirname |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1107 $ echo line1 > olddirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1108 $ hg add olddirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1109 $ hg ci -m first |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1110 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1111 $ hg branch newdirname |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1112 marked working directory as branch newdirname |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1113 (branches are permanent and global, did you want a bookmark?) |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1114 $ hg mv olddirname newdirname |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1115 moving olddirname/commonfile.py to newdirname/commonfile.py (glob) |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1116 $ hg ci -m rename |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1117 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1118 $ hg update default |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1119 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1120 $ echo line1 > olddirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1121 $ hg add olddirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1122 $ hg ci -m log |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1123 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1124 $ hg up newdirname |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1125 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1126 $ # create newdirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1127 $ hg merge default |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1129 (branch merge, don't forget to commit) |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1130 $ hg ci -m add |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1131 $ |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1132 $ hg debugrename newdirname/newfile.py |
24229
f903689680e6
test-commit-amend: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24169
diff
changeset
|
1133 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob) |
24169
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1134 $ hg status -C --change . |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1135 A newdirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1136 $ hg status -C --rev 1 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1137 A newdirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1138 $ hg status -C --rev 2 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1139 A newdirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1140 olddirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1141 A newdirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1142 olddirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1143 R olddirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1144 R olddirname/newfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1145 $ hg debugindex newdirname/newfile.py |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
1146 rev offset length delta linkrev nodeid p1 p2 |
30792
4215dc1b708b
revlog: make compressed size comparisons consistent
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30695
diff
changeset
|
1147 0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000 |
24169
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1148 |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1149 $ echo a >> newdirname/commonfile.py |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1150 $ hg ci --amend -m bug |
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1151 $ hg debugrename newdirname/newfile.py |
24229
f903689680e6
test-commit-amend: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24169
diff
changeset
|
1152 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob) |
24169
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1153 $ hg debugindex newdirname/newfile.py |
26927
0829ed3b75e1
test: use general delta for 'test-commit-amend.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26750
diff
changeset
|
1154 rev offset length delta linkrev nodeid p1 p2 |
30792
4215dc1b708b
revlog: make compressed size comparisons consistent
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30695
diff
changeset
|
1155 0 0 89 -1 3 34a4d536c0c0 000000000000 000000000000 |
24169
ac41aa4a66ab
amend: check for directory renames for both merge parents (issue4516)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23835
diff
changeset
|
1156 |
30240
8237c3359db5
tests: test preserving execbit changes at amending only on execbit platform
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30211
diff
changeset
|
1157 #if execbit |
8237c3359db5
tests: test preserving execbit changes at amending only on execbit platform
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30211
diff
changeset
|
1158 |
29181
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1159 Test if amend preserves executable bit changes |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1160 $ chmod +x newdirname/commonfile.py |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1161 $ hg ci -m chmod |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1162 $ hg ci --amend -m "chmod amended" |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1163 $ hg ci --amend -m "chmod amended second time" |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1164 $ hg log -p --git -r . |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1165 changeset: 7:b1326f52dddf |
29181
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1166 branch: newdirname |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1167 tag: tip |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34059
diff
changeset
|
1168 parent: 4:7fd235f7cb2f |
29181
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1169 user: test |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1170 date: Thu Jan 01 00:00:00 1970 +0000 |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1171 summary: chmod amended second time |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1172 |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1173 diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1174 old mode 100644 |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1175 new mode 100755 |
dae38633eba8
localrepo: prevent executable-bit only changes from being lost on amend
Mateusz Kwapich <mitrandir@fb.com>
parents:
28627
diff
changeset
|
1176 |
30240
8237c3359db5
tests: test preserving execbit changes at amending only on execbit platform
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30211
diff
changeset
|
1177 #endif |
34059
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1178 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1179 Test amend with file inclusion options |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1180 -------------------------------------- |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1181 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1182 These tests ensure that we are always amending some files that were part of the |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1183 pre-amend commit. We want to test that the remaining files in the pre-amend |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1184 commit were not changed in the amended commit. We do so by performing a diff of |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1185 the amended commit against its parent commit. |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1186 $ cd .. |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1187 $ hg init testfileinclusions |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1188 $ cd testfileinclusions |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1189 $ echo a > a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1190 $ echo b > b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1191 $ hg commit -Aqm "Adding a and b" |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1192 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1193 Only add changes to a particular file |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1194 $ echo a >> a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1195 $ echo b >> b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1196 $ hg commit --amend -I a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1197 $ hg diff --git -r null -r . |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1198 diff --git a/a b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1199 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1200 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1201 +++ b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1202 @@ -0,0 +1,2 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1203 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1204 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1205 diff --git a/b b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1206 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1207 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1208 +++ b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1209 @@ -0,0 +1,1 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1210 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1211 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1212 $ echo a >> a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1213 $ hg commit --amend b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1214 $ hg diff --git -r null -r . |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1215 diff --git a/a b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1216 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1217 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1218 +++ b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1219 @@ -0,0 +1,2 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1220 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1221 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1222 diff --git a/b b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1223 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1224 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1225 +++ b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1226 @@ -0,0 +1,2 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1227 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1228 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1229 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1230 Exclude changes to a particular file |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1231 $ echo b >> b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1232 $ hg commit --amend -X a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1233 $ hg diff --git -r null -r . |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1234 diff --git a/a b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1235 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1236 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1237 +++ b/a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1238 @@ -0,0 +1,2 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1239 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1240 +a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1241 diff --git a/b b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1242 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1243 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1244 +++ b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1245 @@ -0,0 +1,3 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1246 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1247 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1248 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1249 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1250 Check the addremove flag |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1251 $ echo c > c |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1252 $ rm a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1253 $ hg commit --amend -A |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1254 removing a |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1255 adding c |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1256 $ hg diff --git -r null -r . |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1257 diff --git a/b b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1258 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1259 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1260 +++ b/b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1261 @@ -0,0 +1,3 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1262 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1263 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1264 +b |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1265 diff --git a/c b/c |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1266 new file mode 100644 |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1267 --- /dev/null |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1268 +++ b/c |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1269 @@ -0,0 +1,1 @@ |
6fb5a06b92c6
amend: add tests for amending only some files from commit to be amended
Saurabh Singh <singhsrb@fb.com>
parents:
33774
diff
changeset
|
1270 +c |