Mercurial > hg
annotate tests/test-commit-amend.t @ 16698:26756d9d8143
tests: make test-convert-darcs.t happier with darcs 2.8.0
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Sun, 13 May 2012 11:47:55 +0200 |
parents | f30226b1a46a |
children | 0311a6abd38a 2440822446ce |
rev | line source |
---|---|
16539
249542ded278
tests: skip new tests with requirements not available on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16483
diff
changeset
|
1 $ "$TESTDIR/hghave" execbit || exit 80 |
249542ded278
tests: skip new tests with requirements not available on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16483
diff
changeset
|
2 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
3 $ hg init |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
4 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
5 Setup: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
6 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
7 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
8 $ hg ci -Am 'base' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
9 adding a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
10 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
11 Refuse to amend public csets: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
12 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
13 $ hg phase -r . -p |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
14 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
15 abort: cannot amend public changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
16 [255] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
17 $ hg phase -r . -f -d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
18 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
19 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
20 $ hg ci -Am 'base1' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
21 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
22 Nothing to amend: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
23 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
24 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
25 nothing changed |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
26 [1] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
27 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
28 Amending changeset with changes in working dir: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
29 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
30 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
31 $ hg ci --amend -m 'amend base1' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
32 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
33 $ hg diff -c . |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
34 diff -r ad120869acf0 -r 9cd25b479c51 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
35 --- 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
|
36 +++ 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
|
37 @@ -1,1 +1,3 @@ |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
38 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
39 +a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
40 +a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
41 $ hg log |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
42 changeset: 1:9cd25b479c51 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
43 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
44 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
45 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
|
46 summary: amend base1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
47 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
48 changeset: 0:ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
49 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
50 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
|
51 summary: base |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
52 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
53 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
54 Add new file: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
55 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
56 $ echo b > b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
57 $ hg ci --amend -Am 'amend base1 new file' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
58 adding b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
59 saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg |
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 Remove file that was added in amended commit: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
62 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
63 $ hg rm b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
64 $ hg ci --amend -m 'amend base1 remove new file' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
65 saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
66 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
67 $ hg cat b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
68 b: no such file in rev 664a9b2d60cd |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
69 [1] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
70 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
71 No changes, just a different message: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
72 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
73 $ hg ci -v --amend -m 'no changes, new message' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
74 amending changeset 664a9b2d60cd |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
75 copying changeset 664a9b2d60cd to ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
76 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
77 stripping amended changeset 664a9b2d60cd |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
78 1 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
79 saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
80 1 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
81 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
82 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
83 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
84 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
85 added 1 changesets with 1 changes to 1 files |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
86 committed changeset 1:ea6e356ff2ad |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
87 $ hg diff -c . |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
88 diff -r ad120869acf0 -r ea6e356ff2ad a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
89 --- 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
|
90 +++ 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
|
91 @@ -1,1 +1,3 @@ |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
92 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
93 +a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
94 +a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
95 $ hg log |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
96 changeset: 1:ea6e356ff2ad |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
97 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
98 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
99 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
|
100 summary: no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
101 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
102 changeset: 0:ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
103 user: test |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
104 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
|
105 summary: base |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
106 |
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 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
|
109 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
110 $ echo '[defaults]' >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
111 $ echo 'commit=' >> $HGRCPATH |
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 Test -u/-d: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
114 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
115 $ hg ci --amend -u foo -d '1 0' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
116 saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
117 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
118 $ hg ci --amend -u foo -d '1 0' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
119 saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
120 $ hg log -r . |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
121 changeset: 1:2c94e4a5756f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
122 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
123 user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
124 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
|
125 summary: no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
126 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
127 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
128 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
|
129 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
130 $ cat > editor << '__EOF__' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
131 > #!/bin/sh |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
132 > cat $1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
133 > echo "another precious commit message" > "$1" |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
134 > __EOF__ |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
135 $ chmod +x editor |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
136 $ HGEDITOR="'`pwd`'"/editor hg commit --amend -v |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
137 amending changeset 2c94e4a5756f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
138 copying changeset 2c94e4a5756f to ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
139 no changes, new message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
140 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
141 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
142 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
|
143 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
|
144 HG: -- |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
145 HG: user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
146 HG: branch 'default' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
147 HG: changed a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
148 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
149 stripping amended changeset 2c94e4a5756f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
150 1 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
151 saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
152 1 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
153 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
154 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
155 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
156 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
157 added 1 changesets with 1 changes to 1 files |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
158 committed changeset 1:ffb49186f961 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
159 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
160 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
|
161 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
162 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
163 $ HGEDITOR="'`pwd`'"/editor hg commit --amend -v |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
164 amending changeset ffb49186f961 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
165 another precious commit message |
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 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
168 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
|
169 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
|
170 HG: -- |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
171 HG: user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
172 HG: branch 'default' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
173 HG: changed a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
174 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
175 copying changeset 27f3aacd3011 to ad120869acf0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
176 a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
177 stripping intermediate changeset 27f3aacd3011 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
178 stripping amended changeset ffb49186f961 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
179 2 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
180 saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
181 1 changesets found |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
182 adding branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
183 adding changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
184 adding manifests |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
185 adding file changes |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
186 added 1 changesets with 1 changes to 1 files |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
187 committed changeset 1:fb6cca43446f |
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 $ rm editor |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
190 $ hg log -r . |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
191 changeset: 1:fb6cca43446f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
192 tag: tip |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
193 user: foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
194 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
|
195 summary: another precious commit message |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
196 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
197 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
198 Moving bookmarks, preserve active bookmark: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
199 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
200 $ hg book book1 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
201 $ hg book book2 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
202 $ hg ci --amend -m 'move bookmarks' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
203 saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
204 $ hg book |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
205 book1 1:0cf1c7a51bcf |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
206 * book2 1:0cf1c7a51bcf |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
207 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
208 $ hg ci --amend -m 'move bookmarks' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
209 saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
210 $ hg book |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
211 book1 1:7344472bd951 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
212 * book2 1:7344472bd951 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
213 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
214 $ echo '[defaults]' >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
215 $ echo "commit=-d '0 0'" >> $HGRCPATH |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
216 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
217 Moving branches: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
218 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
219 $ hg branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
220 marked working directory as branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
221 (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
|
222 $ echo a >> a |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
223 $ hg ci -m 'branch foo' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
224 $ hg branch default -f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
225 marked working directory as branch default |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
226 (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
|
227 $ hg ci --amend -m 'back to default' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
228 saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
229 $ hg branches |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
230 default 2:f24ee5961967 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
231 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
232 Close branch: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
233 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
234 $ hg up -q 0 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
235 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
236 $ hg branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
237 marked working directory as branch foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
238 (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
|
239 $ hg ci -Am 'fork' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
240 adding b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
241 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
242 $ hg ci -mb |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
243 $ hg ci --amend --close-branch -m 'closing branch foo' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
244 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
245 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
246 Same thing, different code path: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
247 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
248 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
249 $ hg ci -m 'reopen branch' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
250 reopening closed branch head 4 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
251 $ echo b >> b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
252 $ hg ci --amend --close-branch |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
253 saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
254 $ hg branches |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
255 default 2:f24ee5961967 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
256 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
257 Refuse to amend merges: |
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 $ hg up -q default |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
260 $ hg merge foo |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
261 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
|
262 (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
|
263 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
264 abort: cannot amend while merging |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
265 [255] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
266 $ hg ci -m 'merge' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
267 $ hg ci --amend |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
268 abort: cannot amend merge changesets |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
269 [255] |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
270 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
271 Follow copies/renames: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
272 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
273 $ hg mv b c |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
274 $ hg ci -m 'b -> c' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
275 $ hg mv c d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
276 $ hg ci --amend -m 'b -> d' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
277 saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg |
16483
3c4910364797
tests: ^ must be quoted when used on solaris sh
Mads Kiilerich <mads@kiilerich.com>
parents:
16458
diff
changeset
|
278 $ hg st --rev '.^' --copies d |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
279 A d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
280 b |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
281 $ hg cp d e |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
282 $ hg ci -m 'e = d' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
283 $ hg cp e f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
284 $ hg ci --amend -m 'f = d' |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
285 saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg |
16483
3c4910364797
tests: ^ must be quoted when used on solaris sh
Mads Kiilerich <mads@kiilerich.com>
parents:
16458
diff
changeset
|
286 $ hg st --rev '.^' --copies f |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
287 A f |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
288 d |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
289 |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
290 $ mv f f.orig |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
291 $ hg rm -A f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
292 $ hg ci -m removef |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
293 $ hg cp a f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
294 $ mv f.orig f |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
295 $ hg ci --amend -m replacef |
16553
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
296 saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
297 $ hg st --change . --copies |
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
298 $ hg log -r . --template "{file_copies}\n" |
16553
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
299 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
300 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
301 Move added file (issue3410): |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
302 |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
303 $ echo g >> g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
304 $ hg ci -Am g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
305 adding g |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
306 $ hg mv g h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
307 $ hg ci --amend |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
308 saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
309 $ hg st --change . --copies h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
310 A h |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
311 $ hg log -r . --template "{file_copies}\n" |
9224cc2e99cc
amend: fix copy records handling (issue3410)
Patrick Mezard <patrick@mezard.eu>
parents:
16552
diff
changeset
|
312 |
16552
90ca344a7c55
test-commit-amend: exhibit an --amend weirdness
Patrick Mezard <patrick@mezard.eu>
parents:
16539
diff
changeset
|
313 |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
314 Can't rollback an amend: |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
315 |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
316 $ hg rollback |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
317 no rollback information available |
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
318 [1] |
16630
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
319 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
320 Preserve extra dict (issue3430): |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
321 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
322 $ hg branch a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
323 marked working directory as branch a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
324 (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
|
325 $ echo a >> a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
326 $ hg ci -ma |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
327 $ hg ci --amend -m "a'" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
328 saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
329 $ hg log -r . --template "{branch}\n" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
330 a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
331 $ hg ci --amend -m "a''" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
332 saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
333 $ hg log -r . --template "{branch}\n" |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
334 a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
335 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
336 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
|
337 first graft something so there's an additional entry: |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
338 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
339 $ hg up 0 -q |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
340 $ echo z > z |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
341 $ hg ci -Am 'fork' |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
342 adding z |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
343 created new head |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
344 $ hg up 11 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
345 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
|
346 $ hg graft 12 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
347 grafting revision 12 |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
348 $ hg ci --amend -m 'graft amend' |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
349 saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
350 $ hg log -r . --debug | grep extra |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
351 extra: branch=a |
f30226b1a46a
amend: preserve extra dict (issue3430)
Idan Kamara <idankk86@gmail.com>
parents:
16553
diff
changeset
|
352 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a |