| author | Greg Onufer <gonufer@jazzhaiku.com> |
| Wed, 09 Dec 2009 16:56:00 -0800 | |
| branch | stable |
| changeset 10135 | 9a4034b630c4 |
| parent 9611 | a3d73b3e1f8a |
| child 12156 | 4c94b6d0fb1c |
| permissions | -rw-r--r-- |
| 990 | 1 |
creating base |
|
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
2 |
updating to branch default |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
3 |
4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 990 | 4 |
creating branch a |
5 |
creating branch b |
|
6 |
we shouldn't have anything but n state here |
|
7 |
merging |
|
8 |
pulling from ../a |
|
9 |
searching for changes |
|
10 |
adding changesets |
|
11 |
adding manifests |
|
12 |
adding file changes |
|
| 1043 | 13 |
added 1 changesets with 2 changes to 2 files (+1 heads) |
|
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
14 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
| 990 | 15 |
merging for foo |
16 |
resolving manifests |
|
17 |
getting bar |
|
18 |
merging 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
|
19 |
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
|
20 |
(branch merge, don't forget to commit) |
| 990 | 21 |
we shouldn't have anything but foo in merge state here |
22 |
m 644 3 foo |
|
23 |
main: we should have a merge here |
|
24 |
rev offset length base linkrev nodeid p1 p2 |
|
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
25 |
0 0 77 0 0 c36078bec30d 000000000000 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
26 |
1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
27 |
2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
28 |
3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 |
| 993 | 29 |
log should show foo and quux changed |
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
30 |
changeset: 3:0c2cc6fc80e2 |
| 993 | 31 |
tag: tip |
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
32 |
parent: 1:182b283965f1 |
|
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
33 |
parent: 2:a6aef98656b7 |
| 993 | 34 |
user: test |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
35 |
date: Mon Jan 12 13:46:40 1970 +0000 |
| 993 | 36 |
files: foo quux |
37 |
description: |
|
38 |
merge |
|
39 |
||
40 |
||
| 990 | 41 |
foo: we should have a merge here |
42 |
rev offset length base linkrev nodeid p1 p2 |
|
43 |
0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
44 |
1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
|
45 |
2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
|
46 |
3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a |
|
47 |
bar: we shouldn't have a merge here |
|
48 |
rev offset length base linkrev nodeid p1 p2 |
|
49 |
0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
50 |
1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 |
|
51 |
baz: we shouldn't have a merge here |
|
52 |
rev offset length base linkrev nodeid p1 p2 |
|
53 |
0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
54 |
1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
|
55 |
quux: we shouldn't have a merge here |
|
56 |
rev offset length base linkrev nodeid p1 p2 |
|
57 |
0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
58 |
1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
|
| 993 | 59 |
manifest entries should match tips of all files |
|
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
3311
diff
changeset
|
60 |
33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar |
|
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
3311
diff
changeset
|
61 |
2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz |
|
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
3311
diff
changeset
|
62 |
aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo |
|
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
3311
diff
changeset
|
63 |
6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux |
| 990 | 64 |
everything should be clean now |
65 |
checking changesets |
|
66 |
checking manifests |
|
67 |
crosschecking files in changesets and manifests |
|
68 |
checking files |
|
69 |
4 files, 4 changesets, 10 total revisions |