Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 13cafb250c1a
children a867d59ea97a
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
34 $ mkcommit A0 34 $ mkcommit A0
35 $ echo 42 >> A0 35 $ echo 42 >> A0
36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" 36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" 37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
38 $ hg log --hidden -G 38 $ hg log --hidden -G
39 @ changeset: 3:d004c8f274b9 39 @ changeset: 4:d004c8f274b9
40 | tag: tip 40 | tag: tip
41 | parent: 0:ea207398892e 41 | parent: 0:ea207398892e
42 | user: test 42 | user: test
43 | date: Thu Jan 01 00:00:00 1970 +0000 43 | date: Thu Jan 01 00:00:00 1970 +0000
44 | summary: A2 44 | summary: A2
45 | 45 |
46 | x changeset: 2:a468dc9b3633 46 | x changeset: 3:a468dc9b3633
47 |/ parent: 0:ea207398892e 47 |/ parent: 0:ea207398892e
48 | user: test 48 | user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000 49 | date: Thu Jan 01 00:00:00 1970 +0000
50 | obsolete: reworded as d004c8f274b9 by test2 50 | obsolete: reworded as d004c8f274b9 by test2
51 | summary: A1 51 | summary: A1
52 | 52 |
53 | x changeset: 2:f137d23bb3e1
54 | | user: test
55 | | date: Thu Jan 01 00:00:00 1970 +0000
56 | | obsolete: pruned
57 | | summary: temporary amend commit for 471f378eab4c
58 | |
53 | x changeset: 1:471f378eab4c 59 | x changeset: 1:471f378eab4c
54 |/ user: test 60 |/ user: test
55 | date: Thu Jan 01 00:00:00 1970 +0000 61 | date: Thu Jan 01 00:00:00 1970 +0000
56 | obsolete: rewritten as a468dc9b3633 62 | obsolete: rewritten as a468dc9b3633
57 | summary: A0 63 | summary: A0
68 working directory parent is obsolete! (471f378eab4c) 74 working directory parent is obsolete! (471f378eab4c)
69 (use 'hg evolve' to update to its successor: d004c8f274b9) 75 (use 'hg evolve' to update to its successor: d004c8f274b9)
70 76
71 Precursors template should show current revision as it is the working copy 77 Precursors template should show current revision as it is the working copy
72 $ hg olog tip 78 $ hg olog tip
73 o d004c8f274b9 (3) A2 79 o d004c8f274b9 (4) A2
74 | 80 |
75 x a468dc9b3633 (2) A1 81 x a468dc9b3633 (3) A1
76 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) 82 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
77 | 83 |
78 @ 471f378eab4c (1) A0 84 @ 471f378eab4c (1) A0
79 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) 85 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
80 86
182 | semi-colon: 1:471f378eab4c 188 | semi-colon: 1:471f378eab4c
183 | Successors: 4:d004c8f274b9 189 | Successors: 4:d004c8f274b9
184 | semi-colon: 4:d004c8f274b9 190 | semi-colon: 4:d004c8f274b9
185 | Fate: reworded as d004c8f274b9 by test2 191 | Fate: reworded as d004c8f274b9 by test2
186 | 192 |
187 | @ a468dc9b3633 193 | x f137d23bb3e1
188 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) 194 | | Fate: pruned
195 | |
196 | x 471f378eab4c
197 |/ Successors: 3:a468dc9b3633
198 | semi-colon: 3:a468dc9b3633
199 | Fate: rewritten as a468dc9b3633
189 | 200 |
190 o ea207398892e 201 o ea207398892e
191 202
192 $ hg up 'desc(A2)' 203 $ hg up 'desc(A2)'
193 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 | semi-colon: 1:471f378eab4c 216 | semi-colon: 1:471f378eab4c
206 | Successors: 4:d004c8f274b9 217 | Successors: 4:d004c8f274b9
207 | semi-colon: 4:d004c8f274b9 218 | semi-colon: 4:d004c8f274b9
208 | Fate: reworded as d004c8f274b9 by test2 219 | Fate: reworded as d004c8f274b9 by test2
209 | 220 |
221 | x f137d23bb3e1
222 | | Fate: pruned
223 | |
210 | x 471f378eab4c 224 | x 471f378eab4c
211 |/ Successors: 3:a468dc9b3633 225 |/ Successors: 3:a468dc9b3633
212 | semi-colon: 3:a468dc9b3633 226 | semi-colon: 3:a468dc9b3633
213 | Fate: rewritten as a468dc9b3633 227 | Fate: rewritten as a468dc9b3633
214 | 228 |
224 @ d004c8f274b9 238 @ d004c8f274b9
225 | 239 |
226 | x a468dc9b3633 240 | x a468dc9b3633
227 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) 241 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
228 | 242 |
243 | x f137d23bb3e1
244 | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
245 | |
229 | x 471f378eab4c 246 | x 471f378eab4c
230 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) 247 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
231 | 248 |
232 o ea207398892e 249 o ea207398892e
233 250
235 $ hg fatelogjson --hidden 252 $ hg fatelogjson --hidden
236 @ d004c8f274b9 [] 253 @ d004c8f274b9 []
237 | 254 |
238 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] 255 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
239 |/ 256 |/
257 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
258 | |
240 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] 259 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
241 |/ 260 |/
242 o ea207398892e [] 261 o ea207398892e []
243 262
244 263