23 (branch merge, don't forget to commit) |
23 (branch merge, don't forget to commit) |
24 we shouldn't have anything but foo in merge state here |
24 we shouldn't have anything but foo in merge state here |
25 m 644 3 foo |
25 m 644 3 foo |
26 main: we should have a merge here |
26 main: we should have a merge here |
27 rev offset length base linkrev nodeid p1 p2 |
27 rev offset length base linkrev nodeid p1 p2 |
28 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |
28 0 0 77 0 0 c36078bec30d 000000000000 000000000000 |
29 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 |
29 1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 |
30 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 |
30 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 |
31 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 |
31 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 |
32 log should show foo and quux changed |
32 log should show foo and quux changed |
33 changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 |
33 changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9 |
34 tag: tip |
34 tag: tip |
35 parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f |
35 parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52 |
36 parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e |
36 parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045 |
37 user: test |
37 user: test |
38 date: Thu Jan 1 00:00:00 1970 +0000 |
38 date: Mon Jan 12 13:46:40 1970 +0000 |
39 files: foo quux |
39 files: foo quux |
40 description: |
40 description: |
41 merge |
41 merge |
42 |
42 |
43 |
43 |