Mercurial > hg > pyhgsh
annotate tests/test-filebranch.out @ 1922:6d50d6189269
ui: output the number of file updated/merged/removed/... on update
add a note for people to remember commiting after a merge.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 13 Mar 2006 08:56:59 +0100 |
| parents | 9344f5dd4488 |
| children | 7544700fd931 |
| rev | line source |
|---|---|
| 990 | 1 creating base |
| 2 creating branch a | |
| 3 creating branch b | |
| 4 we shouldn't have anything but n state here | |
| 5 n 644 2 bar | |
| 6 n 644 3 baz | |
| 7 n 644 3 foo | |
| 8 n 644 2 quux | |
| 9 merging | |
| 10 pulling from ../a | |
| 11 searching for changes | |
| 12 adding changesets | |
| 13 adding manifests | |
| 14 adding file changes | |
| 1043 | 15 added 1 changesets with 2 changes to 2 files (+1 heads) |
| 990 | 16 (run 'hg update' to get a working copy) |
| 17 merging for foo | |
| 18 resolving manifests | |
| 19 getting bar | |
| 20 merging foo | |
| 21 resolving foo | |
|
1922
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
22 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
23 (branch merge, don't forget to commit) |
| 990 | 24 we shouldn't have anything but foo in merge state here |
| 25 m 644 3 foo | |
| 26 main: we should have a merge here | |
| 27 rev offset length base linkrev nodeid p1 p2 | |
| 28 0 0 73 0 0 cdca01651b96 000000000000 000000000000 | |
| 29 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 | |
| 30 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 | |
| 993 | 31 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 |
| 32 log should show foo and quux changed | |
| 33 changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 | |
| 34 tag: tip | |
| 35 parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f | |
| 36 parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e | |
| 37 user: test | |
| 38 date: Thu Jan 1 00:00:00 1970 +0000 | |
| 39 files: foo quux | |
| 40 description: | |
| 41 merge | |
| 42 | |
| 43 | |
| 990 | 44 foo: we should have a merge here |
| 45 rev offset length base linkrev nodeid p1 p2 | |
| 46 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 47 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
| 48 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 | |
| 49 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a | |
| 50 bar: we shouldn't have a merge here | |
| 51 rev offset length base linkrev nodeid p1 p2 | |
| 52 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 53 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 | |
| 54 baz: we shouldn't have a merge here | |
| 55 rev offset length base linkrev nodeid p1 p2 | |
| 56 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 57 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
| 58 quux: we shouldn't have a merge here | |
| 59 rev offset length base linkrev nodeid p1 p2 | |
| 60 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 61 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 | |
| 993 | 62 manifest entries should match tips of all files |
| 63 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar | |
| 64 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz | |
| 65 aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo | |
| 66 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux | |
| 990 | 67 everything should be clean now |
| 68 checking changesets | |
| 69 checking manifests | |
| 70 crosschecking files in changesets and manifests | |
| 71 checking files | |
| 72 4 files, 4 changesets, 10 total revisions |