|
1 $ hg init |
|
2 $ echo foo > bar |
|
3 $ hg commit -Am default |
|
4 adding bar |
|
5 $ hg up -r null |
|
6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
7 $ hg branch mine |
|
8 marked working directory as branch mine |
|
9 $ echo hello > world |
|
10 $ hg commit -Am hello |
|
11 adding world |
|
12 $ hg up -r null |
|
13 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
14 $ hg branch other |
|
15 marked working directory as branch other |
|
16 $ echo good > bye |
|
17 $ hg commit -Am other |
|
18 adding bye |
|
19 $ hg up -r mine |
|
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
21 |
|
22 $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other |
|
23 abort: cannot specify both --noupdate and --updaterev |
|
24 |
|
25 $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other |
|
26 requesting all changes |
|
27 adding changesets |
|
28 adding manifests |
|
29 adding file changes |
|
30 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
31 $ rm -rf ../b |
|
32 |
|
33 $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other |
|
34 requesting all changes |
|
35 adding changesets |
|
36 adding manifests |
|
37 adding file changes |
|
38 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
39 updating to branch mine |
|
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 $ rm -rf ../b |
|
42 |
|
43 $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other |
|
44 requesting all changes |
|
45 adding changesets |
|
46 adding manifests |
|
47 adding file changes |
|
48 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
49 updating to branch default |
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51 $ rm -rf ../b |
|
52 |
|
53 $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other |
|
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 mine |
|
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 $ rm -rf ../b |
|
62 |
|
63 $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other |
|
64 requesting all changes |
|
65 adding changesets |
|
66 adding manifests |
|
67 adding file changes |
|
68 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
69 updating to branch other |
|
70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
71 $ rm -rf ../b |
|
72 |
|
73 Test -r mine ... mine is ignored: |
|
74 |
|
75 $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other |
|
76 requesting all changes |
|
77 adding changesets |
|
78 adding manifests |
|
79 adding file changes |
|
80 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
81 updating to branch other |
|
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 $ rm -rf ../b |
|
84 |
|
85 $ hg clone .#other ../b -b default -b mine |
|
86 requesting all changes |
|
87 adding changesets |
|
88 adding manifests |
|
89 adding file changes |
|
90 added 3 changesets with 3 changes to 3 files (+2 heads) |
|
91 updating to branch default |
|
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 $ rm -rf ../b |
|
94 |
|
95 $ hg clone .#other ../b |
|
96 requesting all changes |
|
97 adding changesets |
|
98 adding manifests |
|
99 adding file changes |
|
100 added 1 changesets with 1 changes to 1 files |
|
101 updating to branch other |
|
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 $ rm -rf ../b |
|
104 |
|
105 $ hg clone -U . ../c -r 1 -r 2 > /dev/null |
|
106 $ hg clone ../c ../b |
|
107 updating to branch other |
|
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 $ rm -rf ../b ../c |
|
110 |