author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Mon, 24 Sep 2018 00:51:39 +0200 | |
changeset 4135 | 47f1d7b4305d |
parent 3663 | 54a469cd5b26 |
child 3712 | fbcf9e92097e |
child 4576 | 96ce1030d2fb |
permissions | -rw-r--r-- |
978 | 1 |
ensure that all the scenarios in the user guide work as documented |
2 |
||
3 |
basic repo |
|
4 |
$ hg init t |
|
5 |
$ cd t |
|
6 |
$ touch file1.c file2.c |
|
7 |
$ hg -q commit -A -m init |
|
8 |
||
9 |
example 1: commit creates a changeset in draft phase |
|
10 |
(this is nothing to do with evolve, but it's mentioned in the user guide) |
|
11 |
$ echo 'feature Y' >> file1.c |
|
12 |
$ hg commit -u alice -d '0 0' -m 'implement feature X' |
|
13 |
$ hg phase -r . |
|
14 |
1: draft |
|
15 |
$ hg identify -in |
|
16 |
6e725fd2be6f 1 |
|
17 |
||
18 |
example 2: unsafe amend with plain vanilla Mercurial: the original |
|
19 |
commit is stripped |
|
20 |
$ hg commit --amend -u alice -d '1 0' -m 'implement feature Y' |
|
2723
c8ba73642143
test: handle output change in 20f533a92eda
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
21 |
saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob) |
978 | 22 |
$ hg log -r 23fe4ac6d3f1 |
23 |
abort: unknown revision '23fe4ac6d3f1'! |
|
24 |
[255] |
|
25 |
$ hg identify -in |
|
26 |
fe0ecd3bd2a4 1 |
|
27 |
||
28 |
enable evolve for safe history modification |
|
29 |
$ cat >> $HGRCPATH <<EOF |
|
30 |
> [alias] |
|
31 |
> shortlog = log --template '{rev}:{node|short} {phase} {desc|firstline}\n' |
|
32 |
> [extensions] |
|
33 |
> rebase = |
|
34 |
> EOF |
|
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1782
diff
changeset
|
35 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
978 | 36 |
|
37 |
example 3: safe amend with "hg commit --amend" (figure 2) |
|
38 |
$ echo 'tweak feature Y' >> file1.c |
|
39 |
$ hg commit --amend -u alice -d '2 0' -m 'implement feature Y' |
|
40 |
$ hg shortlog -q -r fe0ecd3bd2a4 |
|
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3417
diff
changeset
|
41 |
abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3417
diff
changeset
|
42 |
(use --hidden to access hidden revisions) |
978 | 43 |
[255] |
44 |
$ hg --hidden shortlog -G |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
45 |
@ 2:934359450037 draft implement feature Y |
978 | 46 |
| |
47 |
| x 1:fe0ecd3bd2a4 draft implement feature Y |
|
48 |
|/ |
|
49 |
o 0:08c4b6f4efc8 draft init |
|
50 |
||
51 |
example 3 redux: repeat safe amend, this time with "hg amend" |
|
52 |
$ hg rollback -q |
|
53 |
$ hg amend -u alice -d '2 0' -m 'implement feature Y' |
|
54 |
$ hg --hidden shortlog -G |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
55 |
@ 2:934359450037 draft implement feature Y |
978 | 56 |
| |
57 |
| x 1:fe0ecd3bd2a4 draft implement feature Y |
|
58 |
|/ |
|
59 |
o 0:08c4b6f4efc8 draft init |
|
60 |
||
61 |
example 4: prune at head (figure 3) |
|
62 |
$ echo 'debug hack' >> file1.c |
|
63 |
$ hg commit -m 'debug hack' |
|
64 |
$ hg prune . |
|
65 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 |
working directory now at 934359450037 |
|
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1195
diff
changeset
|
67 |
1 changesets pruned |
978 | 68 |
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
69 |
2:934359450037 implement feature Y |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
70 |
$ hg --hidden shortlog -G -r 934359450037: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
71 |
x 3:a3e0ef24aaf0 draft debug hack |
978 | 72 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
73 |
@ 2:934359450037 draft implement feature Y |
978 | 74 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
75 |
~ |
978 | 76 |
|
77 |
example 5: uncommit files at head (figure 4) |
|
78 |
$ echo 'relevant' >> file1.c |
|
79 |
$ echo 'irrelevant' >> file2.c |
|
80 |
$ hg commit -u dan -d '10 0' -m 'fix bug 234' |
|
81 |
$ hg uncommit file2.c |
|
82 |
$ hg status |
|
83 |
M file2.c |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
84 |
$ hg --hidden shortlog -G -r 'descendants(934359450037) - a3e0ef24aaf0' |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
85 |
@ 5:c8defeecf7a4 draft fix bug 234 |
978 | 86 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
87 |
| x 4:da4331967f5f draft fix bug 234 |
978 | 88 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
89 |
o 2:934359450037 draft implement feature Y |
978 | 90 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
91 |
~ |
978 | 92 |
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
93 |
5:c8defeecf7a4 fix bug 234 |
978 | 94 |
file1.c |
95 |
$ hg revert --no-backup file2.c |
|
96 |
||
97 |
example 6: fold multiple changesets together into one (figure 5) |
|
98 |
$ echo step1 >> file1.c |
|
99 |
$ hg commit -m 'step 1' |
|
100 |
$ echo step2 >> file1.c |
|
101 |
$ hg commit -m 'step 2' |
|
102 |
$ echo step3 >> file2.c |
|
103 |
$ hg commit -m 'step 3' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
104 |
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' -r 05e61aab8294:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
105 |
6:05e61aab8294 step 1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
106 |
7:be6d5bc8e4cc step 2 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
107 |
8:35f432d9f7c1 step 3 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
108 |
$ hg fold -d '0 0' -m 'fix bug 64' --from -r 05e61aab8294:: |
978 | 109 |
3 changesets folded |
110 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
111 |
$ hg --hidden shortlog -G -r c8defeecf7a4:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
112 |
@ 9:171c6a79a27b draft fix bug 64 |
978 | 113 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
114 |
| x 8:35f432d9f7c1 draft step 3 |
978 | 115 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
116 |
| x 7:be6d5bc8e4cc draft step 2 |
978 | 117 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
118 |
| x 6:05e61aab8294 draft step 1 |
978 | 119 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
120 |
o 5:c8defeecf7a4 draft fix bug 234 |
978 | 121 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
122 |
~ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
123 |
$ hg --hidden log -q -r 'successors(05e61aab8294) | successors(be6d5bc8e4cc) | successors(35f432d9f7c1)' |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
124 |
9:171c6a79a27b |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
125 |
$ hg --hidden log -q -r 'precursors(171c6a79a27b)' |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
126 |
6:05e61aab8294 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
127 |
7:be6d5bc8e4cc |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
128 |
8:35f432d9f7c1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
129 |
$ hg diff -c 171c6a79a27b -U 0 |
978 | 130 |
diff -r c8defeecf7a4 -r 171c6a79a27b file1.c |
131 |
--- a/file1.c Thu Jan 01 00:00:10 1970 +0000 |
|
132 |
+++ b/file1.c Thu Jan 01 00:00:00 1970 +0000 |
|
133 |
@@ -3,0 +4,2 @@ |
|
134 |
+step1 |
|
135 |
+step2 |
|
136 |
diff -r c8defeecf7a4 -r 171c6a79a27b file2.c |
|
137 |
--- a/file2.c Thu Jan 01 00:00:10 1970 +0000 |
|
138 |
+++ b/file2.c Thu Jan 01 00:00:00 1970 +0000 |
|
139 |
@@ -0,0 +1,1 @@ |
|
140 |
+step3 |
|
141 |
||
142 |
setup for example 7: amend an older changeset |
|
143 |
$ echo 'fix fix oops fix' > file2.c |
|
144 |
$ hg commit -u bob -d '3 0' -m 'fix bug 17' |
|
145 |
$ echo 'cleanup' >> file1.c |
|
146 |
$ hg commit -u bob -d '4 0' -m 'cleanup' |
|
147 |
$ echo 'new feature' >> file1.c |
|
148 |
$ hg commit -u bob -d '5 0' -m 'feature 23' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
149 |
$ hg --hidden shortlog -G -r 171c6a79a27b:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
150 |
@ 12:dadcbba2d606 draft feature 23 |
978 | 151 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
152 |
o 11:debd46bb29dc draft cleanup |
978 | 153 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
154 |
o 10:3e1cb8f70c02 draft fix bug 17 |
978 | 155 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
156 |
o 9:171c6a79a27b draft fix bug 64 |
978 | 157 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
158 |
~ |
978 | 159 |
|
160 |
example 7: amend an older changeset (figures 6, 7) |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
161 |
$ hg update -q -r 3e1cb8f70c02 |
978 | 162 |
$ echo 'fix fix fix fix' > file2.c |
163 |
$ hg amend -u bob -d '6 0' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
164 |
2 new orphan changesets |
978 | 165 |
$ hg shortlog -r 'obsolete()' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
166 |
10:3e1cb8f70c02 draft fix bug 17 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
167 |
$ hg shortlog -r "orphan()" |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
168 |
11:debd46bb29dc draft cleanup |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
169 |
12:dadcbba2d606 draft feature 23 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
170 |
$ hg --hidden shortlog -G -r 171c6a79a27b:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
171 |
@ 13:395cbeda3a06 draft fix bug 17 |
978 | 172 |
| |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
173 |
| * 12:dadcbba2d606 draft feature 23 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
174 |
| | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
175 |
| * 11:debd46bb29dc draft cleanup |
978 | 176 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
177 |
| x 10:3e1cb8f70c02 draft fix bug 17 |
978 | 178 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
179 |
o 9:171c6a79a27b draft fix bug 64 |
978 | 180 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
181 |
~ |
978 | 182 |
$ hg evolve -q --all |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
183 |
$ hg shortlog -G -r 171c6a79a27b:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
184 |
@ 15:91b4b0f8b5c5 draft feature 23 |
978 | 185 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
186 |
o 14:fe8858bd9bc2 draft cleanup |
978 | 187 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
188 |
o 13:395cbeda3a06 draft fix bug 17 |
978 | 189 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
190 |
o 9:171c6a79a27b draft fix bug 64 |
978 | 191 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
192 |
~ |
978 | 193 |
|
194 |
setup for example 8: prune an older changeset (figure 8) |
|
195 |
$ echo 'useful' >> file1.c |
|
196 |
$ hg commit -u carl -d '7 0' -m 'useful work' |
|
197 |
$ echo 'debug' >> file2.c |
|
198 |
$ hg commit -u carl -d '8 0' -m 'debug hack' |
|
199 |
$ echo 'more useful' >> file1.c |
|
200 |
$ hg commit -u carl -d '9 0' -m 'more work' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
201 |
$ hg shortlog -G -r 91b4b0f8b5c5:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
202 |
@ 18:ea8fafca914b draft more work |
978 | 203 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
204 |
o 17:b23d06b457a8 draft debug hack |
978 | 205 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
206 |
o 16:1f33e68b18b9 draft useful work |
978 | 207 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
208 |
o 15:91b4b0f8b5c5 draft feature 23 |
978 | 209 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
210 |
~ |
978 | 211 |
|
212 |
example 8: prune an older changeset (figures 8, 9) |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
213 |
$ hg prune b23d06b457a8 |
978 | 214 |
1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
215 |
1 new orphan changesets |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
216 |
$ hg --hidden shortlog -G -r b23d06b457a8:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
217 |
@ 18:ea8fafca914b draft more work |
978 | 218 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
219 |
x 17:b23d06b457a8 draft debug hack |
978 | 220 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
221 |
~ |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1239
diff
changeset
|
222 |
$ hg evolve -q --all --any |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
223 |
$ hg --hidden shortlog -G -r 1f33e68b18b9:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
224 |
@ 19:4393e5877437 draft more work |
978 | 225 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
226 |
| x 18:ea8fafca914b draft more work |
978 | 227 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
228 |
| x 17:b23d06b457a8 draft debug hack |
978 | 229 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
230 |
o 16:1f33e68b18b9 draft useful work |
978 | 231 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
232 |
~ |
978 | 233 |
|
234 |
example 9: uncommit files from an older changeset (discard changes) |
|
235 |
(figure 10) |
|
236 |
$ echo 'this fixes bug 53' >> file1.c |
|
237 |
$ echo 'debug hack' >> file2.c |
|
238 |
$ hg commit -u dan -d '11 0' -m 'fix bug 53' |
|
239 |
$ echo 'and this handles bug 67' >> file1.c |
|
240 |
$ hg commit -u dan -d '12 0' -m 'fix bug 67' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
241 |
$ hg update -r f84357446753 |
978 | 242 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
243 |
$ hg shortlog -G -r 4393e5877437:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
244 |
o 21:4db2428c8ae3 draft fix bug 67 |
978 | 245 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
246 |
@ 20:f84357446753 draft fix bug 53 |
978 | 247 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
248 |
o 19:4393e5877437 draft more work |
978 | 249 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
250 |
~ |
978 | 251 |
$ hg uncommit file2.c |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
252 |
1 new orphan changesets |
978 | 253 |
$ hg status |
254 |
M file2.c |
|
255 |
$ hg revert file2.c |
|
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1239
diff
changeset
|
256 |
$ hg evolve --all --any |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
257 |
move:[21] fix bug 67 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
258 |
atop:[22] fix bug 53 |
1099
bac4e0bc9f6a
evolve: write a status message when the working directory changes
David Soria Parra <davidsp@fb.com>
parents:
978
diff
changeset
|
259 |
working directory is now at 0d972d6888e6 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
260 |
$ hg --hidden shortlog -G -r 4393e5877437:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
261 |
@ 23:0d972d6888e6 draft fix bug 67 |
978 | 262 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
263 |
o 22:71bb83d674c5 draft fix bug 53 |
978 | 264 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
265 |
| x 21:4db2428c8ae3 draft fix bug 67 |
978 | 266 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
267 |
| x 20:f84357446753 draft fix bug 53 |
978 | 268 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
269 |
o 19:4393e5877437 draft more work |
978 | 270 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
271 |
~ |
978 | 272 |
$ rm file2.c.orig |
273 |
||
274 |
example 10: uncommit files from an older changeset (keep changes) |
|
275 |
(figures 11, 12) |
|
276 |
$ echo 'fix a bug' >> file1.c |
|
277 |
$ echo 'useful but unrelated' >> file2.c |
|
278 |
$ hg commit -u dan -d '11 0' -m 'fix a bug' |
|
279 |
$ echo 'new feature' >> file1.c |
|
280 |
$ hg commit -u dan -d '12 0' -m 'new feature' |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
281 |
$ hg update 5b31a1239ab9 |
978 | 282 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
283 |
$ hg --hidden shortlog -G -r 0d972d6888e6:: |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
284 |
o 25:fbb3c6d50427 draft new feature |
978 | 285 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
286 |
@ 24:5b31a1239ab9 draft fix a bug |
978 | 287 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
288 |
o 23:0d972d6888e6 draft fix bug 67 |
978 | 289 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
290 |
~ |
978 | 291 |
$ hg uncommit file2.c |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
292 |
1 new orphan changesets |
978 | 293 |
$ hg status |
294 |
M file2.c |
|
295 |
$ hg commit -m 'useful tweak' |
|
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2854
diff
changeset
|
296 |
$ hg --hidden shortlog -G -r 0d972d6888e6:: |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
297 |
@ 27:51e0d8c0a922 draft useful tweak |
978 | 298 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
299 |
o 26:2594e98553a9 draft fix a bug |
978 | 300 |
| |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
301 |
| * 25:fbb3c6d50427 draft new feature |
978 | 302 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
303 |
| x 24:5b31a1239ab9 draft fix a bug |
978 | 304 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
305 |
o 23:0d972d6888e6 draft fix bug 67 |
978 | 306 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
307 |
~ |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1239
diff
changeset
|
308 |
$ hg evolve --all --any |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
309 |
move:[25] new feature |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
310 |
atop:[26] fix a bug |
1099
bac4e0bc9f6a
evolve: write a status message when the working directory changes
David Soria Parra <davidsp@fb.com>
parents:
978
diff
changeset
|
311 |
working directory is now at 166c1c368ab6 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2854
diff
changeset
|
312 |
$ hg --hidden shortlog -G -r 0d972d6888e6:: |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
313 |
@ 28:166c1c368ab6 draft new feature |
978 | 314 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
315 |
| o 27:51e0d8c0a922 draft useful tweak |
978 | 316 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
317 |
o 26:2594e98553a9 draft fix a bug |
978 | 318 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
319 |
| x 25:fbb3c6d50427 draft new feature |
978 | 320 |
| | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
321 |
| x 24:5b31a1239ab9 draft fix a bug |
978 | 322 |
|/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
323 |
o 23:0d972d6888e6 draft fix bug 67 |
978 | 324 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1422
diff
changeset
|
325 |
~ |