Mercurial > hg
comparison tests/test-clone-update-order.out @ 10637:7ce62865d72a stable
commands: document and test hg clone update priority
author | timeless <timeless@gmail.com> |
---|---|
date | Thu, 11 Mar 2010 10:06:01 +0200 |
parents | |
children | 5b48d819d5f9 |
comparison
equal
deleted
inserted
replaced
10618:508fda6b8637 | 10637:7ce62865d72a |
---|---|
1 | |
2 % prepare repo a | |
3 adding bar | |
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
5 marked working directory as branch mine | |
6 adding world | |
7 created new head | |
8 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
9 marked working directory as branch other | |
10 adding bye | |
11 created new head | |
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
13 % test -U -u | |
14 abort: cannot specify both --noupdate and --updaterev | |
15 % test -U | |
16 requesting all changes | |
17 adding changesets | |
18 adding manifests | |
19 adding file changes | |
20 added 3 changesets with 3 changes to 3 files (+2 heads) | |
21 % test -u . | |
22 requesting all changes | |
23 adding changesets | |
24 adding manifests | |
25 adding file changes | |
26 added 3 changesets with 3 changes to 3 files (+2 heads) | |
27 updating to branch mine | |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
29 % test -u 0 | |
30 requesting all changes | |
31 adding changesets | |
32 adding manifests | |
33 adding file changes | |
34 added 3 changesets with 3 changes to 3 files (+2 heads) | |
35 updating to branch default | |
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 % test -u 1 | |
38 requesting all changes | |
39 adding changesets | |
40 adding manifests | |
41 adding file changes | |
42 added 3 changesets with 3 changes to 3 files (+2 heads) | |
43 updating to branch mine | |
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
45 % test -u 2 | |
46 requesting all changes | |
47 adding changesets | |
48 adding manifests | |
49 adding file changes | |
50 added 3 changesets with 3 changes to 3 files (+2 heads) | |
51 updating to branch other | |
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 % test -r 0 | |
54 requesting all changes | |
55 adding changesets | |
56 adding manifests | |
57 adding file changes | |
58 added 3 changesets with 3 changes to 3 files (+2 heads) | |
59 updating to branch other | |
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
61 % test -r mine ... mine is ignored | |
62 requesting all changes | |
63 adding changesets | |
64 adding manifests | |
65 adding file changes | |
66 added 3 changesets with 3 changes to 3 files (+2 heads) | |
67 updating to branch other | |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
69 % test -b default | |
70 requesting all changes | |
71 adding changesets | |
72 adding manifests | |
73 adding file changes | |
74 added 3 changesets with 3 changes to 3 files (+2 heads) | |
75 updating to branch default | |
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
77 % test | |
78 requesting all changes | |
79 adding changesets | |
80 adding manifests | |
81 adding file changes | |
82 added 1 changesets with 1 changes to 1 files | |
83 updating to branch other | |
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 % test tip | |
86 updating to branch other | |
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |