Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3936:537fd9a86c06 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 00:22:50 +0200 |
| parents | d00f0c369bc7 a77fb9669e99 |
| children | e07e764c0f48 |
comparison
equal
deleted
inserted
replaced
| 3935:9af0e2b0bdd7 | 3936:537fd9a86c06 |
|---|---|
| 33 $ mkcommit A0 | 33 $ mkcommit A0 |
| 34 $ echo 42 >> A0 | 34 $ echo 42 >> A0 |
| 35 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" | 35 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" |
| 36 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" | 36 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" |
| 37 $ hg log --hidden -G | 37 $ hg log --hidden -G |
| 38 @ changeset: 3:d004c8f274b9 | 38 @ changeset: 4:d004c8f274b9 |
| 39 | tag: tip | 39 | tag: tip |
| 40 | parent: 0:ea207398892e | 40 | parent: 0:ea207398892e |
| 41 | user: test | 41 | user: test |
| 42 | date: Thu Jan 01 00:00:00 1970 +0000 | 42 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 43 | summary: A2 | 43 | summary: A2 |
| 44 | | 44 | |
| 45 | x changeset: 2:a468dc9b3633 | 45 | x changeset: 3:a468dc9b3633 |
| 46 |/ parent: 0:ea207398892e | 46 |/ parent: 0:ea207398892e |
| 47 | user: test | 47 | user: test |
| 48 | date: Thu Jan 01 00:00:00 1970 +0000 | 48 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 49 | obsolete: reworded using amend as 3:d004c8f274b9 by test2 | 49 | obsolete: reworded as d004c8f274b9 by test2 |
| 50 | summary: A1 | 50 | summary: A1 |
| 51 | | 51 | |
| 52 | x changeset: 2:f137d23bb3e1 | |
| 53 | | user: test | |
| 54 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 55 | | obsolete: pruned | |
| 56 | | summary: temporary amend commit for 471f378eab4c | |
| 57 | | | |
| 52 | x changeset: 1:471f378eab4c | 58 | x changeset: 1:471f378eab4c |
| 53 |/ user: test | 59 |/ user: test |
| 54 | date: Thu Jan 01 00:00:00 1970 +0000 | 60 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 55 | obsolete: rewritten using amend as 2:a468dc9b3633 | 61 | obsolete: rewritten as a468dc9b3633 |
| 56 | summary: A0 | 62 | summary: A0 |
| 57 | | 63 | |
| 58 o changeset: 0:ea207398892e | 64 o changeset: 0:ea207398892e |
| 59 user: test | 65 user: test |
| 60 date: Thu Jan 01 00:00:00 1970 +0000 | 66 date: Thu Jan 01 00:00:00 1970 +0000 |
| 67 working directory parent is obsolete! (471f378eab4c) | 73 working directory parent is obsolete! (471f378eab4c) |
| 68 (use 'hg evolve' to update to its successor: d004c8f274b9) | 74 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 69 | 75 |
| 70 Precursors template should show current revision as it is the working copy | 76 Precursors template should show current revision as it is the working copy |
| 71 $ hg olog tip | 77 $ hg olog tip |
| 72 o d004c8f274b9 (3) A2 | 78 o d004c8f274b9 (4) A2 |
| 73 | | 79 | |
| 74 x a468dc9b3633 (2) A1 | 80 x a468dc9b3633 (3) A1 |
| 75 | rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000) | 81 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) |
| 76 | | 82 | |
| 77 @ 471f378eab4c (1) A0 | 83 @ 471f378eab4c (1) A0 |
| 78 rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000) | 84 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) |
| 79 | 85 |
| 80 $ hg tlog | 86 $ hg tlog |
| 81 o d004c8f274b9 | 87 o d004c8f274b9 |
| 82 | Precursors: 1:471f378eab4c | 88 | Precursors: 1:471f378eab4c |
| 83 | semi-colon: 1:471f378eab4c | 89 | semi-colon: 1:471f378eab4c |
| 84 | @ 471f378eab4c | 90 | @ 471f378eab4c |
| 85 |/ Successors: 3:d004c8f274b9 | 91 |/ Successors: 4:d004c8f274b9 |
| 86 | semi-colon: 3:d004c8f274b9 | 92 | semi-colon: 4:d004c8f274b9 |
| 87 | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2 | 93 | Fate: rewritten as d004c8f274b9 by test, test2 |
| 88 | | 94 | |
| 89 o ea207398892e | 95 o ea207398892e |
| 90 | 96 |
| 91 | 97 |
| 92 $ hg log -G | 98 $ hg log -G |
| 93 o changeset: 3:d004c8f274b9 | 99 o changeset: 4:d004c8f274b9 |
| 94 | tag: tip | 100 | tag: tip |
| 95 | parent: 0:ea207398892e | 101 | parent: 0:ea207398892e |
| 96 | user: test | 102 | user: test |
| 97 | date: Thu Jan 01 00:00:00 1970 +0000 | 103 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 98 | summary: A2 | 104 | summary: A2 |
| 99 | | 105 | |
| 100 | @ changeset: 1:471f378eab4c | 106 | @ changeset: 1:471f378eab4c |
| 101 |/ user: test | 107 |/ user: test |
| 102 | date: Thu Jan 01 00:00:00 1970 +0000 | 108 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 103 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 | 109 | obsolete: rewritten as d004c8f274b9 by test, test2 |
| 104 | summary: A0 | 110 | summary: A0 |
| 105 | | 111 | |
| 106 o changeset: 0:ea207398892e | 112 o changeset: 0:ea207398892e |
| 107 user: test | 113 user: test |
| 108 date: Thu Jan 01 00:00:00 1970 +0000 | 114 date: Thu Jan 01 00:00:00 1970 +0000 |
| 111 | 117 |
| 112 $ hg fatelog -q | 118 $ hg fatelog -q |
| 113 o d004c8f274b9 | 119 o d004c8f274b9 |
| 114 | | 120 | |
| 115 | @ 471f378eab4c | 121 | @ 471f378eab4c |
| 116 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 | 122 |/ Obsfate: rewritten as d004c8f274b9 |
| 117 | | 123 | |
| 118 o ea207398892e | 124 o ea207398892e |
| 119 | 125 |
| 120 | 126 |
| 121 $ hg fatelog | 127 $ hg fatelog |
| 122 o d004c8f274b9 | 128 o d004c8f274b9 |
| 123 | | 129 | |
| 124 | @ 471f378eab4c | 130 | @ 471f378eab4c |
| 125 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | 131 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 |
| 126 | | 132 | |
| 127 o ea207398892e | 133 o ea207398892e |
| 128 | 134 |
| 129 $ hg fatelog -v | 135 $ hg fatelog -v |
| 130 o d004c8f274b9 | 136 o d004c8f274b9 |
| 131 | | 137 | |
| 132 | @ 471f378eab4c | 138 | @ 471f378eab4c |
| 133 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) | 139 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
| 134 | | 140 | |
| 135 o ea207398892e | 141 o ea207398892e |
| 136 | 142 |
| 137 | 143 |
| 138 (check json) | 144 (check json) |
| 159 (use 'hg evolve' to update to its successor: d004c8f274b9) | 165 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 160 | 166 |
| 161 Precursors template should show current revision as it is the working copy | 167 Precursors template should show current revision as it is the working copy |
| 162 $ hg tlog | 168 $ hg tlog |
| 163 o d004c8f274b9 | 169 o d004c8f274b9 |
| 164 | Precursors: 2:a468dc9b3633 | 170 | Precursors: 3:a468dc9b3633 |
| 165 | semi-colon: 2:a468dc9b3633 | 171 | semi-colon: 3:a468dc9b3633 |
| 166 | @ a468dc9b3633 | 172 | @ a468dc9b3633 |
| 167 |/ Successors: 3:d004c8f274b9 | 173 |/ Successors: 4:d004c8f274b9 |
| 168 | semi-colon: 3:d004c8f274b9 | 174 | semi-colon: 4:d004c8f274b9 |
| 169 | Fate: reworded using amend as 3:d004c8f274b9 by test2 | 175 | Fate: reworded as d004c8f274b9 by test2 |
| 170 | | 176 | |
| 171 o ea207398892e | 177 o ea207398892e |
| 172 | 178 |
| 173 Precursors template should show the precursor as we force its display with | 179 Precursors template should show the precursor as we force its display with |
| 174 --hidden | 180 --hidden |
| 175 $ hg tlog --hidden | 181 $ hg tlog --hidden |
| 176 o d004c8f274b9 | 182 o d004c8f274b9 |
| 177 | Precursors: 2:a468dc9b3633 | 183 | Precursors: 3:a468dc9b3633 |
| 178 | semi-colon: 2:a468dc9b3633 | 184 | semi-colon: 3:a468dc9b3633 |
| 179 | @ a468dc9b3633 | 185 | @ a468dc9b3633 |
| 180 |/ Precursors: 1:471f378eab4c | 186 |/ Precursors: 1:471f378eab4c |
| 181 | semi-colon: 1:471f378eab4c | 187 | semi-colon: 1:471f378eab4c |
| 182 | Successors: 3:d004c8f274b9 | 188 | Successors: 4:d004c8f274b9 |
| 183 | semi-colon: 3:d004c8f274b9 | 189 | semi-colon: 4:d004c8f274b9 |
| 184 | Fate: reworded using amend as 3:d004c8f274b9 by test2 | 190 | Fate: reworded as d004c8f274b9 by test2 |
| 185 | | 191 | |
| 186 | x 471f378eab4c | 192 | x f137d23bb3e1 |
| 187 |/ Successors: 2:a468dc9b3633 | 193 | | Fate: pruned |
| 188 | semi-colon: 2:a468dc9b3633 | 194 | | |
| 189 | Fate: rewritten using amend as 2:a468dc9b3633 | 195 | x 471f378eab4c |
| 190 | | 196 |/ Successors: 3:a468dc9b3633 |
| 191 o ea207398892e | 197 | semi-colon: 3:a468dc9b3633 |
| 192 | 198 | Fate: rewritten as a468dc9b3633 |
| 193 $ hg fatelog -v | |
| 194 o d004c8f274b9 | |
| 195 | | |
| 196 | @ a468dc9b3633 | |
| 197 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |
| 198 | | 199 | |
| 199 o ea207398892e | 200 o ea207398892e |
| 200 | 201 |
| 201 $ hg up 'desc(A2)' | 202 $ hg up 'desc(A2)' |
| 202 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 205 | | 206 | |
| 206 o ea207398892e | 207 o ea207398892e |
| 207 | 208 |
| 208 $ hg tlog --hidden | 209 $ hg tlog --hidden |
| 209 @ d004c8f274b9 | 210 @ d004c8f274b9 |
| 210 | Precursors: 2:a468dc9b3633 | 211 | Precursors: 3:a468dc9b3633 |
| 211 | semi-colon: 2:a468dc9b3633 | 212 | semi-colon: 3:a468dc9b3633 |
| 212 | x a468dc9b3633 | 213 | x a468dc9b3633 |
| 213 |/ Precursors: 1:471f378eab4c | 214 |/ Precursors: 1:471f378eab4c |
| 214 | semi-colon: 1:471f378eab4c | 215 | semi-colon: 1:471f378eab4c |
| 215 | Successors: 3:d004c8f274b9 | 216 | Successors: 4:d004c8f274b9 |
| 216 | semi-colon: 3:d004c8f274b9 | 217 | semi-colon: 4:d004c8f274b9 |
| 217 | Fate: reworded using amend as 3:d004c8f274b9 by test2 | 218 | Fate: reworded as d004c8f274b9 by test2 |
| 218 | | 219 | |
| 219 | x 471f378eab4c | 220 | x f137d23bb3e1 |
| 220 |/ Successors: 2:a468dc9b3633 | 221 | | Fate: pruned |
| 221 | semi-colon: 2:a468dc9b3633 | 222 | | |
| 222 | Fate: rewritten using amend as 2:a468dc9b3633 | 223 | x 471f378eab4c |
| 224 |/ Successors: 3:a468dc9b3633 | |
| 225 | semi-colon: 3:a468dc9b3633 | |
| 226 | Fate: rewritten as a468dc9b3633 | |
| 223 | | 227 | |
| 224 o ea207398892e | 228 o ea207398892e |
| 225 | 229 |
| 226 $ hg fatelog -v | 230 $ hg fatelog -v |
| 227 @ d004c8f274b9 | 231 @ d004c8f274b9 |
| 231 | 235 |
| 232 $ hg fatelog -v --hidden | 236 $ hg fatelog -v --hidden |
| 233 @ d004c8f274b9 | 237 @ d004c8f274b9 |
| 234 | | 238 | |
| 235 | x a468dc9b3633 | 239 | x a468dc9b3633 |
| 236 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | 240 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
| 237 | | 241 | |
| 238 | x 471f378eab4c | 242 | x f137d23bb3e1 |
| 239 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | 243 | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000) |
| 244 | | | |
| 245 | x 471f378eab4c | |
| 246 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |
| 240 | | 247 | |
| 241 o ea207398892e | 248 o ea207398892e |
| 242 | 249 |
| 243 | 250 |
| 244 Test templates with splitted commit | 251 Test templates with splitted commit |
| 313 | summary: A0 | 320 | summary: A0 |
| 314 | | 321 | |
| 315 | x changeset: 1:471597cad322 | 322 | x changeset: 1:471597cad322 |
| 316 |/ user: test | 323 |/ user: test |
| 317 | date: Thu Jan 01 00:00:00 1970 +0000 | 324 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 318 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a | 325 | obsolete: split as 337fec4d2edc, f257fde29c7a |
| 319 | summary: A0 | 326 | summary: A0 |
| 320 | | 327 | |
| 321 o changeset: 0:ea207398892e | 328 o changeset: 0:ea207398892e |
| 322 user: test | 329 user: test |
| 323 date: Thu Jan 01 00:00:00 1970 +0000 | 330 date: Thu Jan 01 00:00:00 1970 +0000 |
| 341 | Precursors: 1:471597cad322 | 348 | Precursors: 1:471597cad322 |
| 342 | semi-colon: 1:471597cad322 | 349 | semi-colon: 1:471597cad322 |
| 343 | @ 471597cad322 | 350 | @ 471597cad322 |
| 344 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | 351 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
| 345 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a | 352 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
| 346 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a | 353 | Fate: split as 337fec4d2edc, f257fde29c7a |
| 347 | | 354 | |
| 348 o ea207398892e | 355 o ea207398892e |
| 349 | 356 |
| 350 $ hg fatelog | 357 $ hg fatelog |
| 351 o f257fde29c7a | 358 o f257fde29c7a |
| 352 | | 359 | |
| 353 o 337fec4d2edc | 360 o 337fec4d2edc |
| 354 | | 361 | |
| 355 | @ 471597cad322 | 362 | @ 471597cad322 |
| 356 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a | 363 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
| 357 | | 364 | |
| 358 o ea207398892e | 365 o ea207398892e |
| 359 | 366 |
| 360 | 367 |
| 361 $ hg up f257fde29c7a | 368 $ hg up f257fde29c7a |
| 380 | Precursors: 1:471597cad322 | 387 | Precursors: 1:471597cad322 |
| 381 | semi-colon: 1:471597cad322 | 388 | semi-colon: 1:471597cad322 |
| 382 | x 471597cad322 | 389 | x 471597cad322 |
| 383 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | 390 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
| 384 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a | 391 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
| 385 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a | 392 | Fate: split as 337fec4d2edc, f257fde29c7a |
| 386 | | 393 | |
| 387 o ea207398892e | 394 o ea207398892e |
| 388 | 395 |
| 389 $ hg fatelog --hidden | 396 $ hg fatelog --hidden |
| 390 @ f257fde29c7a | 397 @ f257fde29c7a |
| 391 | | 398 | |
| 392 o 337fec4d2edc | 399 o 337fec4d2edc |
| 393 | | 400 | |
| 394 | x 471597cad322 | 401 | x 471597cad322 |
| 395 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a | 402 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
| 396 | | 403 | |
| 397 o ea207398892e | 404 o ea207398892e |
| 398 | 405 |
| 399 | 406 |
| 400 Test templates with folded commit | 407 Test templates with folded commit |
| 437 | summary: C0 | 444 | summary: C0 |
| 438 | | 445 | |
| 439 | x changeset: 2:0dec01379d3b | 446 | x changeset: 2:0dec01379d3b |
| 440 | | user: test | 447 | | user: test |
| 441 | | date: Thu Jan 01 00:00:00 1970 +0000 | 448 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 442 | | obsolete: rewritten using fold as 3:eb5a0daa2192 | 449 | | obsolete: rewritten as eb5a0daa2192 |
| 443 | | summary: B0 | 450 | | summary: B0 |
| 444 | | | 451 | | |
| 445 | x changeset: 1:471f378eab4c | 452 | x changeset: 1:471f378eab4c |
| 446 |/ user: test | 453 |/ user: test |
| 447 | date: Thu Jan 01 00:00:00 1970 +0000 | 454 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 448 | obsolete: rewritten using fold as 3:eb5a0daa2192 | 455 | obsolete: rewritten as eb5a0daa2192 |
| 449 | summary: A0 | 456 | summary: A0 |
| 450 | | 457 | |
| 451 o changeset: 0:ea207398892e | 458 o changeset: 0:ea207398892e |
| 452 user: test | 459 user: test |
| 453 date: Thu Jan 01 00:00:00 1970 +0000 | 460 date: Thu Jan 01 00:00:00 1970 +0000 |
| 467 | Precursors: 1:471f378eab4c | 474 | Precursors: 1:471f378eab4c |
| 468 | semi-colon: 1:471f378eab4c | 475 | semi-colon: 1:471f378eab4c |
| 469 | @ 471f378eab4c | 476 | @ 471f378eab4c |
| 470 |/ Successors: 3:eb5a0daa2192 | 477 |/ Successors: 3:eb5a0daa2192 |
| 471 | semi-colon: 3:eb5a0daa2192 | 478 | semi-colon: 3:eb5a0daa2192 |
| 472 | Fate: rewritten using fold as 3:eb5a0daa2192 | 479 | Fate: rewritten as eb5a0daa2192 |
| 473 | | 480 | |
| 474 o ea207398892e | 481 o ea207398892e |
| 475 | 482 |
| 476 $ hg fatelog | 483 $ hg fatelog |
| 477 o eb5a0daa2192 | 484 o eb5a0daa2192 |
| 478 | | 485 | |
| 479 | @ 471f378eab4c | 486 | @ 471f378eab4c |
| 480 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 | 487 |/ Obsfate: rewritten as eb5a0daa2192 |
| 481 | | 488 | |
| 482 o ea207398892e | 489 o ea207398892e |
| 483 | 490 |
| 484 $ hg up 'desc(B0)' --hidden | 491 $ hg up 'desc(B0)' --hidden |
| 485 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 493 | Precursors: 2:0dec01379d3b 1:471f378eab4c | 500 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
| 494 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 501 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 495 | @ 0dec01379d3b | 502 | @ 0dec01379d3b |
| 496 | | Successors: 3:eb5a0daa2192 | 503 | | Successors: 3:eb5a0daa2192 |
| 497 | | semi-colon: 3:eb5a0daa2192 | 504 | | semi-colon: 3:eb5a0daa2192 |
| 498 | | Fate: rewritten using fold as 3:eb5a0daa2192 | 505 | | Fate: rewritten as eb5a0daa2192 |
| 499 | | | 506 | | |
| 500 | x 471f378eab4c | 507 | x 471f378eab4c |
| 501 |/ Successors: 3:eb5a0daa2192 | 508 |/ Successors: 3:eb5a0daa2192 |
| 502 | semi-colon: 3:eb5a0daa2192 | 509 | semi-colon: 3:eb5a0daa2192 |
| 503 | Fate: rewritten using fold as 3:eb5a0daa2192 | 510 | Fate: rewritten as eb5a0daa2192 |
| 504 | | 511 | |
| 505 o ea207398892e | 512 o ea207398892e |
| 506 | 513 |
| 507 $ hg fatelog | 514 $ hg fatelog |
| 508 o eb5a0daa2192 | 515 o eb5a0daa2192 |
| 509 | | 516 | |
| 510 | @ 0dec01379d3b | 517 | @ 0dec01379d3b |
| 511 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 | 518 | | Obsfate: rewritten as eb5a0daa2192 |
| 512 | | | 519 | | |
| 513 | x 471f378eab4c | 520 | x 471f378eab4c |
| 514 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 | 521 |/ Obsfate: rewritten as eb5a0daa2192 |
| 515 | | 522 | |
| 516 o ea207398892e | 523 o ea207398892e |
| 517 | 524 |
| 518 | 525 |
| 519 $ hg up 'desc(C0)' | 526 $ hg up 'desc(C0)' |
| 533 | Precursors: 2:0dec01379d3b 1:471f378eab4c | 540 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
| 534 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 541 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 535 | x 0dec01379d3b | 542 | x 0dec01379d3b |
| 536 | | Successors: 3:eb5a0daa2192 | 543 | | Successors: 3:eb5a0daa2192 |
| 537 | | semi-colon: 3:eb5a0daa2192 | 544 | | semi-colon: 3:eb5a0daa2192 |
| 538 | | Fate: rewritten using fold as 3:eb5a0daa2192 | 545 | | Fate: rewritten as eb5a0daa2192 |
| 539 | | | 546 | | |
| 540 | x 471f378eab4c | 547 | x 471f378eab4c |
| 541 |/ Successors: 3:eb5a0daa2192 | 548 |/ Successors: 3:eb5a0daa2192 |
| 542 | semi-colon: 3:eb5a0daa2192 | 549 | semi-colon: 3:eb5a0daa2192 |
| 543 | Fate: rewritten using fold as 3:eb5a0daa2192 | 550 | Fate: rewritten as eb5a0daa2192 |
| 544 | | 551 | |
| 545 o ea207398892e | 552 o ea207398892e |
| 546 | 553 |
| 547 $ hg fatelog --hidden | 554 $ hg fatelog --hidden |
| 548 @ eb5a0daa2192 | 555 @ eb5a0daa2192 |
| 549 | | 556 | |
| 550 | x 0dec01379d3b | 557 | x 0dec01379d3b |
| 551 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 | 558 | | Obsfate: rewritten as eb5a0daa2192 |
| 552 | | | 559 | | |
| 553 | x 471f378eab4c | 560 | x 471f378eab4c |
| 554 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 | 561 |/ Obsfate: rewritten as eb5a0daa2192 |
| 555 | | 562 | |
| 556 o ea207398892e | 563 o ea207398892e |
| 557 | 564 |
| 558 | 565 |
| 559 Test templates with divergence | 566 Test templates with divergence |
| 576 | summary: A1 | 583 | summary: A1 |
| 577 | | 584 | |
| 578 | x changeset: 1:471f378eab4c | 585 | x changeset: 1:471f378eab4c |
| 579 |/ user: test | 586 |/ user: test |
| 580 | date: Thu Jan 01 00:00:00 1970 +0000 | 587 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 581 | obsolete: reworded using amend as 2:fdf9bde5129a | 588 | obsolete: reworded as fdf9bde5129a |
| 582 | summary: A0 | 589 | summary: A0 |
| 583 | | 590 | |
| 584 o changeset: 0:ea207398892e | 591 o changeset: 0:ea207398892e |
| 585 user: test | 592 user: test |
| 586 date: Thu Jan 01 00:00:00 1970 +0000 | 593 date: Thu Jan 01 00:00:00 1970 +0000 |
| 589 $ hg update --hidden 'desc(A0)' | 596 $ hg update --hidden 'desc(A0)' |
| 590 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 597 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 591 working directory parent is obsolete! (471f378eab4c) | 598 working directory parent is obsolete! (471f378eab4c) |
| 592 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 599 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 593 $ hg amend -m "A2" | 600 $ hg amend -m "A2" |
| 594 2 new content-divergent changesets | 601 2 new divergent changesets |
| 595 $ hg log --hidden -G | 602 $ hg log --hidden -G |
| 596 @ changeset: 3:65b757b745b9 | 603 @ changeset: 3:65b757b745b9 |
| 597 | tag: tip | 604 | tag: tip |
| 598 | parent: 0:ea207398892e | 605 | parent: 0:ea207398892e |
| 599 | user: test | 606 | user: test |
| 600 | date: Thu Jan 01 00:00:00 1970 +0000 | 607 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 601 | instability: content-divergent | 608 | trouble: divergent |
| 602 | summary: A2 | 609 | summary: A2 |
| 603 | | 610 | |
| 604 | o changeset: 2:fdf9bde5129a | 611 | o changeset: 2:fdf9bde5129a |
| 605 |/ parent: 0:ea207398892e | 612 |/ parent: 0:ea207398892e |
| 606 | user: test | 613 | user: test |
| 607 | date: Thu Jan 01 00:00:00 1970 +0000 | 614 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 608 | instability: content-divergent | 615 | trouble: divergent |
| 609 | summary: A1 | 616 | summary: A1 |
| 610 | | 617 | |
| 611 | x changeset: 1:471f378eab4c | 618 | x changeset: 1:471f378eab4c |
| 612 |/ user: test | 619 |/ user: test |
| 613 | date: Thu Jan 01 00:00:00 1970 +0000 | 620 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 614 | obsolete: reworded using amend as 2:fdf9bde5129a | 621 | obsolete: reworded as fdf9bde5129a |
| 615 | obsolete: reworded using amend as 3:65b757b745b9 | 622 | obsolete: reworded as 65b757b745b9 |
| 616 | summary: A0 | 623 | summary: A0 |
| 617 | | 624 | |
| 618 o changeset: 0:ea207398892e | 625 o changeset: 0:ea207398892e |
| 619 user: test | 626 user: test |
| 620 date: Thu Jan 01 00:00:00 1970 +0000 | 627 date: Thu Jan 01 00:00:00 1970 +0000 |
| 639 |/ Precursors: 1:471f378eab4c | 646 |/ Precursors: 1:471f378eab4c |
| 640 | semi-colon: 1:471f378eab4c | 647 | semi-colon: 1:471f378eab4c |
| 641 | @ 471f378eab4c | 648 | @ 471f378eab4c |
| 642 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 | 649 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
| 643 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 | 650 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
| 644 | Fate: reworded using amend as 2:fdf9bde5129a | 651 | Fate: reworded as fdf9bde5129a |
| 645 | Fate: reworded using amend as 4:019fadeab383 | 652 | Fate: reworded as 019fadeab383 |
| 646 | | 653 | |
| 647 o ea207398892e | 654 o ea207398892e |
| 648 | 655 |
| 649 $ hg fatelog | 656 $ hg fatelog |
| 650 o 019fadeab383 | 657 o 019fadeab383 |
| 651 | | 658 | |
| 652 | o fdf9bde5129a | 659 | o fdf9bde5129a |
| 653 |/ | 660 |/ |
| 654 | @ 471f378eab4c | 661 | @ 471f378eab4c |
| 655 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 | 662 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 |
| 656 | | 663 | |
| 657 o ea207398892e | 664 o ea207398892e |
| 658 | 665 |
| 659 | 666 |
| 660 $ hg up 'desc(A1)' | 667 $ hg up 'desc(A1)' |
| 684 | x 65b757b745b9 | 691 | x 65b757b745b9 |
| 685 |/ Precursors: 1:471f378eab4c | 692 |/ Precursors: 1:471f378eab4c |
| 686 | semi-colon: 1:471f378eab4c | 693 | semi-colon: 1:471f378eab4c |
| 687 | Successors: 4:019fadeab383 | 694 | Successors: 4:019fadeab383 |
| 688 | semi-colon: 4:019fadeab383 | 695 | semi-colon: 4:019fadeab383 |
| 689 | Fate: reworded using amend as 4:019fadeab383 | 696 | Fate: reworded as 019fadeab383 |
| 690 | | 697 | |
| 691 | @ fdf9bde5129a | 698 | @ fdf9bde5129a |
| 692 |/ Precursors: 1:471f378eab4c | 699 |/ Precursors: 1:471f378eab4c |
| 693 | semi-colon: 1:471f378eab4c | 700 | semi-colon: 1:471f378eab4c |
| 694 | x 471f378eab4c | 701 | x 471f378eab4c |
| 695 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 | 702 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
| 696 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 | 703 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
| 697 | Fate: reworded using amend as 2:fdf9bde5129a | 704 | Fate: reworded as fdf9bde5129a |
| 698 | Fate: reworded using amend as 3:65b757b745b9 | 705 | Fate: reworded as 65b757b745b9 |
| 699 | | 706 | |
| 700 o ea207398892e | 707 o ea207398892e |
| 701 | 708 |
| 702 $ hg fatelog --hidden | 709 $ hg fatelog --hidden |
| 703 o 019fadeab383 | 710 o 019fadeab383 |
| 704 | | 711 | |
| 705 | x 65b757b745b9 | 712 | x 65b757b745b9 |
| 706 |/ Obsfate: reworded using amend as 4:019fadeab383 | 713 |/ Obsfate: reworded as 019fadeab383 |
| 707 | | 714 | |
| 708 | @ fdf9bde5129a | 715 | @ fdf9bde5129a |
| 709 |/ | 716 |/ |
| 710 | x 471f378eab4c | 717 | x 471f378eab4c |
| 711 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 | 718 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 |
| 712 | | 719 | |
| 713 o ea207398892e | 720 o ea207398892e |
| 714 | 721 |
| 715 | 722 |
| 716 Test templates with amended + folded commit | 723 Test templates with amended + folded commit |
| 734 | summary: B1 | 741 | summary: B1 |
| 735 | | 742 | |
| 736 | x changeset: 2:0dec01379d3b | 743 | x changeset: 2:0dec01379d3b |
| 737 |/ user: test | 744 |/ user: test |
| 738 | date: Thu Jan 01 00:00:00 1970 +0000 | 745 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 739 | obsolete: reworded using amend as 3:b7ea6d14e664 | 746 | obsolete: reworded as b7ea6d14e664 |
| 740 | summary: B0 | 747 | summary: B0 |
| 741 | | 748 | |
| 742 o changeset: 1:471f378eab4c | 749 o changeset: 1:471f378eab4c |
| 743 | user: test | 750 | user: test |
| 744 | date: Thu Jan 01 00:00:00 1970 +0000 | 751 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 762 | | 769 | |
| 763 | x changeset: 3:b7ea6d14e664 | 770 | x changeset: 3:b7ea6d14e664 |
| 764 | | parent: 1:471f378eab4c | 771 | | parent: 1:471f378eab4c |
| 765 | | user: test | 772 | | user: test |
| 766 | | date: Thu Jan 01 00:00:00 1970 +0000 | 773 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 767 | | obsolete: rewritten using fold as 4:eb5a0daa2192 | 774 | | obsolete: rewritten as eb5a0daa2192 |
| 768 | | summary: B1 | 775 | | summary: B1 |
| 769 | | | 776 | | |
| 770 | | x changeset: 2:0dec01379d3b | 777 | | x changeset: 2:0dec01379d3b |
| 771 | |/ user: test | 778 | |/ user: test |
| 772 | | date: Thu Jan 01 00:00:00 1970 +0000 | 779 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 773 | | obsolete: reworded using amend as 3:b7ea6d14e664 | 780 | | obsolete: reworded as b7ea6d14e664 |
| 774 | | summary: B0 | 781 | | summary: B0 |
| 775 | | | 782 | | |
| 776 | x changeset: 1:471f378eab4c | 783 | x changeset: 1:471f378eab4c |
| 777 |/ user: test | 784 |/ user: test |
| 778 | date: Thu Jan 01 00:00:00 1970 +0000 | 785 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 779 | obsolete: rewritten using fold as 4:eb5a0daa2192 | 786 | obsolete: rewritten as eb5a0daa2192 |
| 780 | summary: A0 | 787 | summary: A0 |
| 781 | | 788 | |
| 782 o changeset: 0:ea207398892e | 789 o changeset: 0:ea207398892e |
| 783 user: test | 790 user: test |
| 784 date: Thu Jan 01 00:00:00 1970 +0000 | 791 date: Thu Jan 01 00:00:00 1970 +0000 |
| 796 | Precursors: 1:471f378eab4c | 803 | Precursors: 1:471f378eab4c |
| 797 | semi-colon: 1:471f378eab4c | 804 | semi-colon: 1:471f378eab4c |
| 798 | @ 471f378eab4c | 805 | @ 471f378eab4c |
| 799 |/ Successors: 4:eb5a0daa2192 | 806 |/ Successors: 4:eb5a0daa2192 |
| 800 | semi-colon: 4:eb5a0daa2192 | 807 | semi-colon: 4:eb5a0daa2192 |
| 801 | Fate: rewritten using fold as 4:eb5a0daa2192 | 808 | Fate: rewritten as eb5a0daa2192 |
| 802 | | 809 | |
| 803 o ea207398892e | 810 o ea207398892e |
| 804 | 811 |
| 805 $ hg fatelog | 812 $ hg fatelog |
| 806 o eb5a0daa2192 | 813 o eb5a0daa2192 |
| 807 | | 814 | |
| 808 | @ 471f378eab4c | 815 | @ 471f378eab4c |
| 809 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 | 816 |/ Obsfate: rewritten as eb5a0daa2192 |
| 810 | | 817 | |
| 811 o ea207398892e | 818 o ea207398892e |
| 812 | 819 |
| 813 $ hg up 'desc(B0)' --hidden | 820 $ hg up 'desc(B0)' --hidden |
| 814 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 821 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 819 | Precursors: 2:0dec01379d3b 1:471f378eab4c | 826 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
| 820 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 827 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 821 | @ 0dec01379d3b | 828 | @ 0dec01379d3b |
| 822 | | Successors: 4:eb5a0daa2192 | 829 | | Successors: 4:eb5a0daa2192 |
| 823 | | semi-colon: 4:eb5a0daa2192 | 830 | | semi-colon: 4:eb5a0daa2192 |
| 824 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 | 831 | | Fate: rewritten as eb5a0daa2192 |
| 825 | | | 832 | | |
| 826 | x 471f378eab4c | 833 | x 471f378eab4c |
| 827 |/ Successors: 4:eb5a0daa2192 | 834 |/ Successors: 4:eb5a0daa2192 |
| 828 | semi-colon: 4:eb5a0daa2192 | 835 | semi-colon: 4:eb5a0daa2192 |
| 829 | Fate: rewritten using fold as 4:eb5a0daa2192 | 836 | Fate: rewritten as eb5a0daa2192 |
| 830 | | 837 | |
| 831 o ea207398892e | 838 o ea207398892e |
| 832 | 839 |
| 833 $ hg fatelog | 840 $ hg fatelog |
| 834 o eb5a0daa2192 | 841 o eb5a0daa2192 |
| 835 | | 842 | |
| 836 | @ 0dec01379d3b | 843 | @ 0dec01379d3b |
| 837 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 | 844 | | Obsfate: rewritten as eb5a0daa2192 |
| 838 | | | 845 | | |
| 839 | x 471f378eab4c | 846 | x 471f378eab4c |
| 840 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 | 847 |/ Obsfate: rewritten as eb5a0daa2192 |
| 841 | | 848 | |
| 842 o ea207398892e | 849 o ea207398892e |
| 843 | 850 |
| 844 | 851 |
| 845 $ hg up 'desc(B1)' --hidden | 852 $ hg up 'desc(B1)' --hidden |
| 851 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 | 858 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 |
| 852 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | 859 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
| 853 | @ b7ea6d14e664 | 860 | @ b7ea6d14e664 |
| 854 | | Successors: 4:eb5a0daa2192 | 861 | | Successors: 4:eb5a0daa2192 |
| 855 | | semi-colon: 4:eb5a0daa2192 | 862 | | semi-colon: 4:eb5a0daa2192 |
| 856 | | Fate: rewritten using fold as 4:eb5a0daa2192 | 863 | | Fate: rewritten as eb5a0daa2192 |
| 857 | | | 864 | | |
| 858 | x 471f378eab4c | 865 | x 471f378eab4c |
| 859 |/ Successors: 4:eb5a0daa2192 | 866 |/ Successors: 4:eb5a0daa2192 |
| 860 | semi-colon: 4:eb5a0daa2192 | 867 | semi-colon: 4:eb5a0daa2192 |
| 861 | Fate: rewritten using fold as 4:eb5a0daa2192 | 868 | Fate: rewritten as eb5a0daa2192 |
| 862 | | 869 | |
| 863 o ea207398892e | 870 o ea207398892e |
| 864 | 871 |
| 865 $ hg fatelog | 872 $ hg fatelog |
| 866 o eb5a0daa2192 | 873 o eb5a0daa2192 |
| 867 | | 874 | |
| 868 | @ b7ea6d14e664 | 875 | @ b7ea6d14e664 |
| 869 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 | 876 | | Obsfate: rewritten as eb5a0daa2192 |
| 870 | | | 877 | | |
| 871 | x 471f378eab4c | 878 | x 471f378eab4c |
| 872 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 | 879 |/ Obsfate: rewritten as eb5a0daa2192 |
| 873 | | 880 | |
| 874 o ea207398892e | 881 o ea207398892e |
| 875 | 882 |
| 876 | 883 |
| 877 $ hg up 'desc(C0)' | 884 $ hg up 'desc(C0)' |
| 888 | x b7ea6d14e664 | 895 | x b7ea6d14e664 |
| 889 | | Precursors: 2:0dec01379d3b | 896 | | Precursors: 2:0dec01379d3b |
| 890 | | semi-colon: 2:0dec01379d3b | 897 | | semi-colon: 2:0dec01379d3b |
| 891 | | Successors: 4:eb5a0daa2192 | 898 | | Successors: 4:eb5a0daa2192 |
| 892 | | semi-colon: 4:eb5a0daa2192 | 899 | | semi-colon: 4:eb5a0daa2192 |
| 893 | | Fate: rewritten using fold as 4:eb5a0daa2192 | 900 | | Fate: rewritten as eb5a0daa2192 |
| 894 | | | 901 | | |
| 895 | | x 0dec01379d3b | 902 | | x 0dec01379d3b |
| 896 | |/ Successors: 3:b7ea6d14e664 | 903 | |/ Successors: 3:b7ea6d14e664 |
| 897 | | semi-colon: 3:b7ea6d14e664 | 904 | | semi-colon: 3:b7ea6d14e664 |
| 898 | | Fate: reworded using amend as 3:b7ea6d14e664 | 905 | | Fate: reworded as b7ea6d14e664 |
| 899 | | | 906 | | |
| 900 | x 471f378eab4c | 907 | x 471f378eab4c |
| 901 |/ Successors: 4:eb5a0daa2192 | 908 |/ Successors: 4:eb5a0daa2192 |
| 902 | semi-colon: 4:eb5a0daa2192 | 909 | semi-colon: 4:eb5a0daa2192 |
| 903 | Fate: rewritten using fold as 4:eb5a0daa2192 | 910 | Fate: rewritten as eb5a0daa2192 |
| 904 | | 911 | |
| 905 o ea207398892e | 912 o ea207398892e |
| 906 | 913 |
| 907 $ hg fatelog --hidden | 914 $ hg fatelog --hidden |
| 908 @ eb5a0daa2192 | 915 @ eb5a0daa2192 |
| 909 | | 916 | |
| 910 | x b7ea6d14e664 | 917 | x b7ea6d14e664 |
| 911 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 | 918 | | Obsfate: rewritten as eb5a0daa2192 |
| 912 | | | 919 | | |
| 913 | | x 0dec01379d3b | 920 | | x 0dec01379d3b |
| 914 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 | 921 | |/ Obsfate: reworded as b7ea6d14e664 |
| 915 | | | 922 | | |
| 916 | x 471f378eab4c | 923 | x 471f378eab4c |
| 917 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 | 924 |/ Obsfate: rewritten as eb5a0daa2192 |
| 918 | | 925 | |
| 919 o ea207398892e | 926 o ea207398892e |
| 920 | 927 |
| 921 | 928 |
| 922 Test template with pushed and pulled obs markers | 929 Test template with pushed and pulled obs markers |
| 958 | | 965 | |
| 959 | x changeset: 2:fdf9bde5129a | 966 | x changeset: 2:fdf9bde5129a |
| 960 |/ parent: 0:ea207398892e | 967 |/ parent: 0:ea207398892e |
| 961 | user: test | 968 | user: test |
| 962 | date: Thu Jan 01 00:00:00 1970 +0000 | 969 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 963 | obsolete: reworded using amend as 3:7a230b46bf61 | 970 | obsolete: reworded as 7a230b46bf61 |
| 964 | summary: A1 | 971 | summary: A1 |
| 965 | | 972 | |
| 966 | x changeset: 1:471f378eab4c | 973 | x changeset: 1:471f378eab4c |
| 967 |/ user: test | 974 |/ user: test |
| 968 | date: Thu Jan 01 00:00:00 1970 +0000 | 975 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 969 | obsolete: reworded using amend as 2:fdf9bde5129a | 976 | obsolete: reworded as fdf9bde5129a |
| 970 | summary: A0 | 977 | summary: A0 |
| 971 | | 978 | |
| 972 o changeset: 0:ea207398892e | 979 o changeset: 0:ea207398892e |
| 973 user: test | 980 user: test |
| 974 date: Thu Jan 01 00:00:00 1970 +0000 | 981 date: Thu Jan 01 00:00:00 1970 +0000 |
| 982 adding manifests | 989 adding manifests |
| 983 adding file changes | 990 adding file changes |
| 984 added 1 changesets with 0 changes to 1 files (+1 heads) | 991 added 1 changesets with 0 changes to 1 files (+1 heads) |
| 985 2 new obsolescence markers | 992 2 new obsolescence markers |
| 986 obsoleted 1 changesets | 993 obsoleted 1 changesets |
| 987 new changesets 7a230b46bf61 | |
| 988 (run 'hg heads' to see heads, 'hg merge' to merge) | 994 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 989 working directory parent is obsolete! (471f378eab4c) | 995 working directory parent is obsolete! (471f378eab4c) |
| 990 (use 'hg evolve' to update to its successor: 7a230b46bf61) | 996 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
| 991 $ hg log --hidden -G | 997 $ hg log --hidden -G |
| 992 o changeset: 2:7a230b46bf61 | 998 o changeset: 2:7a230b46bf61 |
| 997 | summary: A2 | 1003 | summary: A2 |
| 998 | | 1004 | |
| 999 | @ changeset: 1:471f378eab4c | 1005 | @ changeset: 1:471f378eab4c |
| 1000 |/ user: test | 1006 |/ user: test |
| 1001 | date: Thu Jan 01 00:00:00 1970 +0000 | 1007 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1002 | obsolete: reworded using amend as 2:7a230b46bf61 | 1008 | obsolete: reworded as 7a230b46bf61 |
| 1003 | summary: A0 | 1009 | summary: A0 |
| 1004 | | 1010 | |
| 1005 o changeset: 0:ea207398892e | 1011 o changeset: 0:ea207398892e |
| 1006 user: test | 1012 user: test |
| 1007 date: Thu Jan 01 00:00:00 1970 +0000 | 1013 date: Thu Jan 01 00:00:00 1970 +0000 |
| 1015 | Precursors: 1:471f378eab4c | 1021 | Precursors: 1:471f378eab4c |
| 1016 | semi-colon: 1:471f378eab4c | 1022 | semi-colon: 1:471f378eab4c |
| 1017 | @ 471f378eab4c | 1023 | @ 471f378eab4c |
| 1018 |/ Successors: 2:7a230b46bf61 | 1024 |/ Successors: 2:7a230b46bf61 |
| 1019 | semi-colon: 2:7a230b46bf61 | 1025 | semi-colon: 2:7a230b46bf61 |
| 1020 | Fate: reworded using amend as 2:7a230b46bf61 | 1026 | Fate: reworded as 7a230b46bf61 |
| 1021 | | 1027 | |
| 1022 o ea207398892e | 1028 o ea207398892e |
| 1023 | 1029 |
| 1024 $ hg fatelog --hidden -v | 1030 $ hg fatelog --hidden -v |
| 1025 o 7a230b46bf61 | 1031 o 7a230b46bf61 |
| 1026 | | 1032 | |
| 1027 | @ 471f378eab4c | 1033 | @ 471f378eab4c |
| 1028 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | 1034 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
| 1029 | | 1035 | |
| 1030 o ea207398892e | 1036 o ea207398892e |
| 1031 | 1037 |
| 1032 $ hg up 'desc(A2)' | 1038 $ hg up 'desc(A2)' |
| 1033 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1039 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1046 | Precursors: 1:471f378eab4c | 1052 | Precursors: 1:471f378eab4c |
| 1047 | semi-colon: 1:471f378eab4c | 1053 | semi-colon: 1:471f378eab4c |
| 1048 | x 471f378eab4c | 1054 | x 471f378eab4c |
| 1049 |/ Successors: 2:7a230b46bf61 | 1055 |/ Successors: 2:7a230b46bf61 |
| 1050 | semi-colon: 2:7a230b46bf61 | 1056 | semi-colon: 2:7a230b46bf61 |
| 1051 | Fate: reworded using amend as 2:7a230b46bf61 | 1057 | Fate: reworded as 7a230b46bf61 |
| 1052 | | 1058 | |
| 1053 o ea207398892e | 1059 o ea207398892e |
| 1054 | 1060 |
| 1055 $ hg fatelog --hidden -v | 1061 $ hg fatelog --hidden -v |
| 1056 @ 7a230b46bf61 | 1062 @ 7a230b46bf61 |
| 1057 | | 1063 | |
| 1058 | x 471f378eab4c | 1064 | x 471f378eab4c |
| 1059 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | 1065 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
| 1060 | | 1066 | |
| 1061 o ea207398892e | 1067 o ea207398892e |
| 1062 | 1068 |
| 1063 | 1069 |
| 1064 Test template with obsmarkers cycle | 1070 Test template with obsmarkers cycle |
| 1109 | @ 0dec01379d3b | 1115 | @ 0dec01379d3b |
| 1110 | | Precursors: 1:471f378eab4c | 1116 | | Precursors: 1:471f378eab4c |
| 1111 | | semi-colon: 1:471f378eab4c | 1117 | | semi-colon: 1:471f378eab4c |
| 1112 | | Successors: 3:f897c6137566; 1:471f378eab4c | 1118 | | Successors: 3:f897c6137566; 1:471f378eab4c |
| 1113 | | semi-colon: 3:f897c6137566; 1:471f378eab4c | 1119 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
| 1114 | | Fate: rewritten as 3:f897c6137566 | 1120 | | Fate: rewritten as f897c6137566 |
| 1115 | | Fate: rewritten as 1:471f378eab4c | 1121 | | Fate: rewritten as 471f378eab4c |
| 1116 | | | 1122 | | |
| 1117 | x 471f378eab4c | 1123 | x 471f378eab4c |
| 1118 |/ Precursors: 2:0dec01379d3b | 1124 |/ Precursors: 2:0dec01379d3b |
| 1119 | semi-colon: 2:0dec01379d3b | 1125 | semi-colon: 2:0dec01379d3b |
| 1120 | Successors: 2:0dec01379d3b | 1126 | Successors: 2:0dec01379d3b |
| 1121 | semi-colon: 2:0dec01379d3b | 1127 | semi-colon: 2:0dec01379d3b |
| 1122 | Fate: rewritten as 2:0dec01379d3b | 1128 | Fate: rewritten as 0dec01379d3b |
| 1123 | | 1129 | |
| 1124 o ea207398892e | 1130 o ea207398892e |
| 1125 | 1131 |
| 1126 $ hg fatelog | 1132 $ hg fatelog |
| 1127 o f897c6137566 | 1133 o f897c6137566 |
| 1128 | | 1134 | |
| 1129 | @ 0dec01379d3b | 1135 | @ 0dec01379d3b |
| 1130 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c | 1136 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
| 1131 | | | 1137 | | |
| 1132 | x 471f378eab4c | 1138 | x 471f378eab4c |
| 1133 |/ Obsfate: rewritten as 2:0dec01379d3b | 1139 |/ Obsfate: rewritten as 0dec01379d3b |
| 1134 | | 1140 | |
| 1135 o ea207398892e | 1141 o ea207398892e |
| 1136 | 1142 |
| 1137 $ hg up -r "desc(A0)" --hidden | 1143 $ hg up -r "desc(A0)" --hidden |
| 1138 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1144 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1175 | x 0dec01379d3b | 1181 | x 0dec01379d3b |
| 1176 | | Precursors: 1:471f378eab4c | 1182 | | Precursors: 1:471f378eab4c |
| 1177 | | semi-colon: 1:471f378eab4c | 1183 | | semi-colon: 1:471f378eab4c |
| 1178 | | Successors: 3:f897c6137566; 1:471f378eab4c | 1184 | | Successors: 3:f897c6137566; 1:471f378eab4c |
| 1179 | | semi-colon: 3:f897c6137566; 1:471f378eab4c | 1185 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
| 1180 | | Fate: rewritten as 3:f897c6137566 | 1186 | | Fate: rewritten as f897c6137566 |
| 1181 | | Fate: rewritten as 1:471f378eab4c | 1187 | | Fate: rewritten as 471f378eab4c |
| 1182 | | | 1188 | | |
| 1183 | x 471f378eab4c | 1189 | x 471f378eab4c |
| 1184 |/ Precursors: 2:0dec01379d3b | 1190 |/ Precursors: 2:0dec01379d3b |
| 1185 | semi-colon: 2:0dec01379d3b | 1191 | semi-colon: 2:0dec01379d3b |
| 1186 | Successors: 2:0dec01379d3b | 1192 | Successors: 2:0dec01379d3b |
| 1187 | semi-colon: 2:0dec01379d3b | 1193 | semi-colon: 2:0dec01379d3b |
| 1188 | Fate: rewritten as 2:0dec01379d3b | 1194 | Fate: rewritten as 0dec01379d3b |
| 1189 | | 1195 | |
| 1190 @ ea207398892e | 1196 @ ea207398892e |
| 1191 | 1197 |
| 1192 Test template with split + divergence with cycles | 1198 Test template with split + divergence with cycles |
| 1193 ================================================= | 1199 ================================================= |
| 1293 Diverge one of the splitted commit | 1299 Diverge one of the splitted commit |
| 1294 | 1300 |
| 1295 $ hg up 6 | 1301 $ hg up 6 |
| 1296 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1302 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1297 $ hg commit --amend -m "Add only B" | 1303 $ hg commit --amend -m "Add only B" |
| 1298 1 new orphan changesets | 1304 1 new unstable changesets |
| 1299 | 1305 |
| 1300 $ hg up 6 --hidden | 1306 $ hg up 6 --hidden |
| 1301 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1307 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1302 working directory parent is obsolete! (4a004186e638) | 1308 working directory parent is obsolete! (4a004186e638) |
| 1303 (use 'hg evolve' to update to its successor: b18bc8331526) | 1309 (use 'hg evolve' to update to its successor: b18bc8331526) |
| 1304 $ hg commit --amend -m "Add B only" | 1310 $ hg commit --amend -m "Add B only" |
| 1305 4 new content-divergent changesets | 1311 4 new divergent changesets |
| 1306 | 1312 |
| 1307 $ hg log -G | 1313 $ hg log -G |
| 1308 @ changeset: 9:0b997eb7ceee | 1314 @ changeset: 9:0b997eb7ceee |
| 1309 | tag: tip | 1315 | tag: tip |
| 1310 | parent: 5:dd800401bd8c | 1316 | parent: 5:dd800401bd8c |
| 1311 | user: test | 1317 | user: test |
| 1312 | date: Thu Jan 01 00:00:00 1970 +0000 | 1318 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1313 | instability: content-divergent | 1319 | trouble: divergent |
| 1314 | summary: Add B only | 1320 | summary: Add B only |
| 1315 | | 1321 | |
| 1316 | o changeset: 8:b18bc8331526 | 1322 | o changeset: 8:b18bc8331526 |
| 1317 |/ parent: 5:dd800401bd8c | 1323 |/ parent: 5:dd800401bd8c |
| 1318 | user: test | 1324 | user: test |
| 1319 | date: Thu Jan 01 00:00:00 1970 +0000 | 1325 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1320 | instability: content-divergent | 1326 | trouble: divergent |
| 1321 | summary: Add only B | 1327 | summary: Add only B |
| 1322 | | 1328 | |
| 1323 | o changeset: 7:ba2ed02b0c9a | 1329 | o changeset: 7:ba2ed02b0c9a |
| 1324 | | user: test | 1330 | | user: test |
| 1325 | | date: Thu Jan 01 00:00:00 1970 +0000 | 1331 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1326 | | instability: orphan, content-divergent | 1332 | | trouble: unstable, divergent |
| 1327 | | summary: Add A,B,C | 1333 | | summary: Add A,B,C |
| 1328 | | | 1334 | | |
| 1329 | x changeset: 6:4a004186e638 | 1335 | x changeset: 6:4a004186e638 |
| 1330 |/ user: test | 1336 |/ user: test |
| 1331 | date: Thu Jan 01 00:00:00 1970 +0000 | 1337 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1332 | obsolete: reworded using amend as 8:b18bc8331526 | 1338 | obsolete: reworded as b18bc8331526 |
| 1333 | obsolete: reworded using amend as 9:0b997eb7ceee | 1339 | obsolete: reworded as 0b997eb7ceee |
| 1334 | summary: Add A,B,C | 1340 | summary: Add A,B,C |
| 1335 | | 1341 | |
| 1336 o changeset: 5:dd800401bd8c | 1342 o changeset: 5:dd800401bd8c |
| 1337 | parent: 3:f897c6137566 | 1343 | parent: 3:f897c6137566 |
| 1338 | user: test | 1344 | user: test |
| 1339 | date: Thu Jan 01 00:00:00 1970 +0000 | 1345 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1340 | instability: content-divergent | 1346 | trouble: divergent |
| 1341 | summary: Add A,B,C | 1347 | summary: Add A,B,C |
| 1342 | | 1348 | |
| 1343 o changeset: 3:f897c6137566 | 1349 o changeset: 3:f897c6137566 |
| 1344 | parent: 0:ea207398892e | 1350 | parent: 0:ea207398892e |
| 1345 | user: test | 1351 | user: test |
| 1364 | o ba2ed02b0c9a | 1370 | o ba2ed02b0c9a |
| 1365 | | | 1371 | | |
| 1366 | x 4a004186e638 | 1372 | x 4a004186e638 |
| 1367 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee | 1373 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
| 1368 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee | 1374 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
| 1369 | Fate: reworded using amend as 8:b18bc8331526 | 1375 | Fate: reworded as b18bc8331526 |
| 1370 | Fate: reworded using amend as 9:0b997eb7ceee | 1376 | Fate: reworded as 0b997eb7ceee |
| 1371 | | 1377 | |
| 1372 o dd800401bd8c | 1378 o dd800401bd8c |
| 1373 | | 1379 | |
| 1374 o f897c6137566 | 1380 o f897c6137566 |
| 1375 | | 1381 | |
| 1381 | o b18bc8331526 | 1387 | o b18bc8331526 |
| 1382 |/ | 1388 |/ |
| 1383 | o ba2ed02b0c9a | 1389 | o ba2ed02b0c9a |
| 1384 | | | 1390 | | |
| 1385 | x 4a004186e638 | 1391 | x 4a004186e638 |
| 1386 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee | 1392 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
| 1387 | | 1393 | |
| 1388 o dd800401bd8c | 1394 o dd800401bd8c |
| 1389 | | 1395 | |
| 1390 o f897c6137566 | 1396 o f897c6137566 |
| 1391 | | 1397 | |
| 1404 | x 4a004186e638 | 1410 | x 4a004186e638 |
| 1405 |/ Precursors: 4:9bd10a0775e4 | 1411 |/ Precursors: 4:9bd10a0775e4 |
| 1406 | semi-colon: 4:9bd10a0775e4 | 1412 | semi-colon: 4:9bd10a0775e4 |
| 1407 | Successors: 8:b18bc8331526; 9:0b997eb7ceee | 1413 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
| 1408 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee | 1414 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
| 1409 | Fate: reworded using amend as 8:b18bc8331526 | 1415 | Fate: reworded as b18bc8331526 |
| 1410 | Fate: reworded using amend as 9:0b997eb7ceee | 1416 | Fate: reworded as 0b997eb7ceee |
| 1411 | | 1417 | |
| 1412 o dd800401bd8c | 1418 o dd800401bd8c |
| 1413 | Precursors: 4:9bd10a0775e4 | 1419 | Precursors: 4:9bd10a0775e4 |
| 1414 | semi-colon: 4:9bd10a0775e4 | 1420 | semi-colon: 4:9bd10a0775e4 |
| 1415 | x 9bd10a0775e4 | 1421 | x 9bd10a0775e4 |
| 1416 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | 1422 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
| 1417 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | 1423 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
| 1418 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | 1424 | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
| 1419 | | 1425 | |
| 1420 o f897c6137566 | 1426 o f897c6137566 |
| 1421 | Precursors: 2:0dec01379d3b | 1427 | Precursors: 2:0dec01379d3b |
| 1422 | semi-colon: 2:0dec01379d3b | 1428 | semi-colon: 2:0dec01379d3b |
| 1423 | x 0dec01379d3b | 1429 | x 0dec01379d3b |
| 1424 | | Precursors: 1:471f378eab4c | 1430 | | Precursors: 1:471f378eab4c |
| 1425 | | semi-colon: 1:471f378eab4c | 1431 | | semi-colon: 1:471f378eab4c |
| 1426 | | Successors: 3:f897c6137566; 1:471f378eab4c | 1432 | | Successors: 3:f897c6137566; 1:471f378eab4c |
| 1427 | | semi-colon: 3:f897c6137566; 1:471f378eab4c | 1433 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
| 1428 | | Fate: rewritten as 3:f897c6137566 | 1434 | | Fate: rewritten as f897c6137566 |
| 1429 | | Fate: rewritten as 1:471f378eab4c | 1435 | | Fate: rewritten as 471f378eab4c |
| 1430 | | | 1436 | | |
| 1431 | x 471f378eab4c | 1437 | x 471f378eab4c |
| 1432 |/ Precursors: 2:0dec01379d3b | 1438 |/ Precursors: 2:0dec01379d3b |
| 1433 | semi-colon: 2:0dec01379d3b | 1439 | semi-colon: 2:0dec01379d3b |
| 1434 | Successors: 2:0dec01379d3b | 1440 | Successors: 2:0dec01379d3b |
| 1435 | semi-colon: 2:0dec01379d3b | 1441 | semi-colon: 2:0dec01379d3b |
| 1436 | Fate: rewritten as 2:0dec01379d3b | 1442 | Fate: rewritten as 0dec01379d3b |
| 1437 | | 1443 | |
| 1438 o ea207398892e | 1444 o ea207398892e |
| 1439 | 1445 |
| 1440 $ hg fatelog --hidden | 1446 $ hg fatelog --hidden |
| 1441 @ 0b997eb7ceee | 1447 @ 0b997eb7ceee |
| 1443 | o b18bc8331526 | 1449 | o b18bc8331526 |
| 1444 |/ | 1450 |/ |
| 1445 | o ba2ed02b0c9a | 1451 | o ba2ed02b0c9a |
| 1446 | | | 1452 | | |
| 1447 | x 4a004186e638 | 1453 | x 4a004186e638 |
| 1448 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee | 1454 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
| 1449 | | 1455 | |
| 1450 o dd800401bd8c | 1456 o dd800401bd8c |
| 1451 | | 1457 | |
| 1452 | x 9bd10a0775e4 | 1458 | x 9bd10a0775e4 |
| 1453 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | 1459 |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
| 1454 | | 1460 | |
| 1455 o f897c6137566 | 1461 o f897c6137566 |
| 1456 | | 1462 | |
| 1457 | x 0dec01379d3b | 1463 | x 0dec01379d3b |
| 1458 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c | 1464 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
| 1459 | | | 1465 | | |
| 1460 | x 471f378eab4c | 1466 | x 471f378eab4c |
| 1461 |/ Obsfate: rewritten as 2:0dec01379d3b | 1467 |/ Obsfate: rewritten as 0dec01379d3b |
| 1462 | | 1468 | |
| 1463 o ea207398892e | 1469 o ea207398892e |
| 1464 | 1470 |
| 1465 $ hg up --hidden 4 | 1471 $ hg up --hidden 4 |
| 1466 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1472 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1482 | Precursors: 4:9bd10a0775e4 | 1488 | Precursors: 4:9bd10a0775e4 |
| 1483 | semi-colon: 4:9bd10a0775e4 | 1489 | semi-colon: 4:9bd10a0775e4 |
| 1484 | @ 9bd10a0775e4 | 1490 | @ 9bd10a0775e4 |
| 1485 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | 1491 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
| 1486 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | 1492 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
| 1487 | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc | 1493 | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc |
| 1488 | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc | 1494 | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
| 1489 | | 1495 | |
| 1490 o f897c6137566 | 1496 o f897c6137566 |
| 1491 | | 1497 | |
| 1492 o ea207398892e | 1498 o ea207398892e |
| 1493 | 1499 |
| 1499 o | b18bc8331526 | 1505 o | b18bc8331526 |
| 1500 |/ | 1506 |/ |
| 1501 o dd800401bd8c | 1507 o dd800401bd8c |
| 1502 | | 1508 | |
| 1503 | @ 9bd10a0775e4 | 1509 | @ 9bd10a0775e4 |
| 1504 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc | 1510 |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
| 1505 | | 1511 | |
| 1506 o f897c6137566 | 1512 o f897c6137566 |
| 1507 | | 1513 | |
| 1508 o ea207398892e | 1514 o ea207398892e |
| 1509 | 1515 |
| 1529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1535 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1530 working directory parent is obsolete! (471f378eab4c) | 1536 working directory parent is obsolete! (471f378eab4c) |
| 1531 (use 'hg evolve' to update to its parent successor) | 1537 (use 'hg evolve' to update to its parent successor) |
| 1532 $ hg tlog | 1538 $ hg tlog |
| 1533 @ 471f378eab4c | 1539 @ 471f378eab4c |
| 1534 | Fate: pruned using prune | 1540 | Fate: pruned |
| 1535 | | 1541 | |
| 1536 o ea207398892e | 1542 o ea207398892e |
| 1537 | 1543 |
| 1538 $ hg fatelog -v | 1544 $ hg fatelog -v |
| 1539 @ 471f378eab4c | 1545 @ 471f378eab4c |
| 1540 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) | 1546 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
| 1541 | | 1547 | |
| 1542 o ea207398892e | 1548 o ea207398892e |
| 1543 | 1549 |