Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | 4b951a9a6895 |
comparison
equal
deleted
inserted
replaced
| 3012:081070828703 | 3013:945a0989e41b |
|---|---|
| 34 $ mkcommit A0 | 34 $ mkcommit A0 |
| 35 $ echo 42 >> A0 | 35 $ echo 42 >> A0 |
| 36 $ HGUSER=test1 hg amend -m "A1" --config devel.default-date="1234567890 0" | 36 $ HGUSER=test1 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: 4:d004c8f274b9 | 39 @ changeset: 3: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: 3:a468dc9b3633 | 46 | x changeset: 2: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 by test2 as d004c8f274b9 | 50 | obsolete: reworded by test2 as d004c8f274b9 |
| 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 by test1 | |
| 57 | | summary: temporary amend commit for 471f378eab4c | |
| 58 | | | |
| 59 | x changeset: 1:471f378eab4c | 53 | x changeset: 1:471f378eab4c |
| 60 |/ user: test | 54 |/ user: test |
| 61 | date: Thu Jan 01 00:00:00 1970 +0000 | 55 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 62 | obsolete: rewritten by test1 as a468dc9b3633 | 56 | obsolete: rewritten by test1 as a468dc9b3633 |
| 63 | summary: A0 | 57 | summary: A0 |
| 74 working directory parent is obsolete! (471f378eab4c) | 68 working directory parent is obsolete! (471f378eab4c) |
| 75 (use 'hg evolve' to update to its successor: d004c8f274b9) | 69 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 76 | 70 |
| 77 Precursors template should show current revision as it is the working copy | 71 Precursors template should show current revision as it is the working copy |
| 78 $ hg olog tip | 72 $ hg olog tip |
| 79 o d004c8f274b9 (4) A2 | 73 o d004c8f274b9 (3) A2 |
| 80 | | 74 | |
| 81 x a468dc9b3633 (3) A1 | 75 x a468dc9b3633 (2) A1 |
| 82 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) | 76 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) |
| 83 | | 77 | |
| 84 @ 471f378eab4c (1) A0 | 78 @ 471f378eab4c (1) A0 |
| 85 rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000) | 79 rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000) |
| 86 | 80 |
| 167 | semi-colon: 471f378eab4c | 161 | semi-colon: 471f378eab4c |
| 168 | Successors: [d004c8f274b9] | 162 | Successors: [d004c8f274b9] |
| 169 | semi-colon: [d004c8f274b9] | 163 | semi-colon: [d004c8f274b9] |
| 170 | Fate: reworded as d004c8f274b9 by test2 | 164 | Fate: reworded as d004c8f274b9 by test2 |
| 171 | | 165 | |
| 172 | x f137d23bb3e1 | |
| 173 | | Fate: pruned by test1 | |
| 174 | | | |
| 175 | x 471f378eab4c | 166 | x 471f378eab4c |
| 176 |/ Successors: [a468dc9b3633] | 167 |/ Successors: [a468dc9b3633] |
| 177 | semi-colon: [a468dc9b3633] | 168 | semi-colon: [a468dc9b3633] |
| 178 | Fate: rewritten as a468dc9b3633 by test1 | 169 | Fate: rewritten as a468dc9b3633 by test1 |
| 179 | | 170 | |
| 203 | semi-colon: 471f378eab4c | 194 | semi-colon: 471f378eab4c |
| 204 | Successors: [d004c8f274b9] | 195 | Successors: [d004c8f274b9] |
| 205 | semi-colon: [d004c8f274b9] | 196 | semi-colon: [d004c8f274b9] |
| 206 | Fate: reworded as d004c8f274b9 by test2 | 197 | Fate: reworded as d004c8f274b9 by test2 |
| 207 | | 198 | |
| 208 | x f137d23bb3e1 | |
| 209 | | Fate: pruned by test1 | |
| 210 | | | |
| 211 | x 471f378eab4c | 199 | x 471f378eab4c |
| 212 |/ Successors: [a468dc9b3633] | 200 |/ Successors: [a468dc9b3633] |
| 213 | semi-colon: [a468dc9b3633] | 201 | semi-colon: [a468dc9b3633] |
| 214 | Fate: rewritten as a468dc9b3633 by test1 | 202 | Fate: rewritten as a468dc9b3633 by test1 |
| 215 | | 203 | |
| 225 @ d004c8f274b9 | 213 @ d004c8f274b9 |
| 226 | | 214 | |
| 227 | x a468dc9b3633 | 215 | x a468dc9b3633 |
| 228 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | 216 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
| 229 | | 217 | |
| 230 | x f137d23bb3e1 | |
| 231 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000) | |
| 232 | | | |
| 233 | x 471f378eab4c | 218 | x 471f378eab4c |
| 234 |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000) | 219 |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000) |
| 235 | | 220 | |
| 236 o ea207398892e | 221 o ea207398892e |
| 237 | 222 |
| 239 $ hg fatelogjson --hidden | 224 $ hg fatelogjson --hidden |
| 240 @ d004c8f274b9 "" | 225 @ d004c8f274b9 "" |
| 241 | | 226 | |
| 242 | 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"}] | 227 | 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"}] |
| 243 |/ | 228 |/ |
| 244 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] | |
| 245 | | | |
| 246 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] | 229 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] |
| 247 |/ | 230 |/ |
| 248 o ea207398892e "" | 231 o ea207398892e "" |
| 249 | 232 |
| 250 | 233 |
| 616 $ hg update --hidden 'desc(A0)' | 599 $ hg update --hidden 'desc(A0)' |
| 617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 600 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 618 working directory parent is obsolete! (471f378eab4c) | 601 working directory parent is obsolete! (471f378eab4c) |
| 619 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 602 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 620 $ hg amend -m "A2" | 603 $ hg amend -m "A2" |
| 621 2 new divergent changesets | 604 2 new content-divergent changesets |
| 622 $ hg log --hidden -G | 605 $ hg log --hidden -G |
| 623 @ changeset: 3:65b757b745b9 | 606 @ changeset: 3:65b757b745b9 |
| 624 | tag: tip | 607 | tag: tip |
| 625 | parent: 0:ea207398892e | 608 | parent: 0:ea207398892e |
| 626 | user: test | 609 | user: test |
| 627 | date: Thu Jan 01 00:00:00 1970 +0000 | 610 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 628 | trouble: divergent | 611 | instability: content-divergent |
| 629 | summary: A2 | 612 | summary: A2 |
| 630 | | 613 | |
| 631 | o changeset: 2:fdf9bde5129a | 614 | o changeset: 2:fdf9bde5129a |
| 632 |/ parent: 0:ea207398892e | 615 |/ parent: 0:ea207398892e |
| 633 | user: test | 616 | user: test |
| 634 | date: Thu Jan 01 00:00:00 1970 +0000 | 617 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 635 | trouble: divergent | 618 | instability: content-divergent |
| 636 | summary: A1 | 619 | summary: A1 |
| 637 | | 620 | |
| 638 | x changeset: 1:471f378eab4c | 621 | x changeset: 1:471f378eab4c |
| 639 |/ user: test | 622 |/ user: test |
| 640 | date: Thu Jan 01 00:00:00 1970 +0000 | 623 | date: Thu Jan 01 00:00:00 1970 +0000 |