20 |
20 |
21 import bookmark by name |
21 import bookmark by name |
22 |
22 |
23 $ hg init ../b |
23 $ hg init ../b |
24 $ cd ../b |
24 $ cd ../b |
|
25 $ hg book Y |
|
26 $ hg book |
|
27 * Y -1:000000000000 |
25 $ hg pull ../a |
28 $ hg pull ../a |
26 pulling from ../a |
29 pulling from ../a |
27 requesting all changes |
30 requesting all changes |
28 adding changesets |
31 adding changesets |
29 adding manifests |
32 adding manifests |
30 adding file changes |
33 adding file changes |
31 added 1 changesets with 1 changes to 1 files |
34 added 1 changesets with 1 changes to 1 files |
32 (run 'hg update' to get a working copy) |
35 (run 'hg update' to get a working copy) |
33 $ hg bookmarks |
36 $ hg bookmarks |
34 no bookmarks set |
37 Y 0:4e3505fd9583 |
|
38 $ hg debugpushkey ../a namespaces |
|
39 bookmarks |
|
40 namespaces |
|
41 $ hg debugpushkey ../a bookmarks |
|
42 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
43 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
44 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
35 $ hg pull -B X ../a |
45 $ hg pull -B X ../a |
36 pulling from ../a |
46 pulling from ../a |
37 searching for changes |
47 searching for changes |
38 no changes found |
48 no changes found |
39 importing bookmark X |
49 importing bookmark X |
40 $ hg bookmark |
50 $ hg bookmark |
|
51 Y 0:4e3505fd9583 |
41 X 0:4e3505fd9583 |
52 X 0:4e3505fd9583 |
42 |
53 |
43 export bookmark by name |
54 export bookmark by name |
44 |
55 |
45 $ hg bookmark W |
56 $ hg bookmark W |
54 Y 0:4e3505fd9583 |
65 Y 0:4e3505fd9583 |
55 X 0:4e3505fd9583 |
66 X 0:4e3505fd9583 |
56 * Z 0:4e3505fd9583 |
67 * Z 0:4e3505fd9583 |
57 W -1:000000000000 |
68 W -1:000000000000 |
58 |
69 |
|
70 delete a remote bookmark |
|
71 |
|
72 $ hg book -d W |
|
73 $ hg push -B W ../a |
|
74 deleting remote bookmark W |
|
75 |
59 push/pull name that doesn't exist |
76 push/pull name that doesn't exist |
60 |
77 |
61 $ hg push -B badname ../a |
78 $ hg push -B badname ../a |
62 bookmark badname does not exist on the local or remote repository! |
79 bookmark badname does not exist on the local or remote repository! |
63 [2] |
80 [2] |
64 $ hg pull -B anotherbadname ../a |
81 $ hg pull -B anotherbadname ../a |
65 abort: remote bookmark anotherbadname not found! |
82 abort: remote bookmark anotherbadname not found! |
66 [255] |
83 [255] |
|
84 |
|
85 divergent bookmarks |
|
86 |
|
87 $ cd ../a |
|
88 $ echo c1 > f1 |
|
89 $ hg ci -Am1 |
|
90 adding f1 |
|
91 $ hg book -f X |
|
92 $ hg book |
|
93 Y 0:4e3505fd9583 |
|
94 * X 1:0d2164f0ce0d |
|
95 Z 1:0d2164f0ce0d |
|
96 |
|
97 $ cd ../b |
|
98 $ hg up |
|
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 $ echo c2 > f2 |
|
101 $ hg ci -Am2 |
|
102 adding f2 |
|
103 $ hg book -f X |
|
104 $ hg book |
|
105 Y 0:4e3505fd9583 |
|
106 * X 1:9b140be10808 |
|
107 foo -1:000000000000 |
|
108 foobar -1:000000000000 |
|
109 |
|
110 $ hg pull ../a |
|
111 pulling from ../a |
|
112 searching for changes |
|
113 adding changesets |
|
114 adding manifests |
|
115 adding file changes |
|
116 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
117 not updating divergent bookmark X |
|
118 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
119 $ hg book |
|
120 Y 0:4e3505fd9583 |
|
121 * X 1:9b140be10808 |
|
122 foo -1:000000000000 |
|
123 foobar -1:000000000000 |
|
124 $ hg push -f ../a |
|
125 pushing to ../a |
|
126 searching for changes |
|
127 adding changesets |
|
128 adding manifests |
|
129 adding file changes |
|
130 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
131 $ hg -R ../a book |
|
132 Y 0:4e3505fd9583 |
|
133 * X 1:0d2164f0ce0d |
|
134 Z 1:0d2164f0ce0d |
|
135 |
|
136 hgweb |
|
137 |
|
138 $ cat <<EOF > .hg/hgrc |
|
139 > [web] |
|
140 > push_ssl = false |
|
141 > allow_push = * |
|
142 > EOF |
|
143 |
|
144 $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log |
|
145 $ cat ../hg.pid >> $DAEMON_PIDS |
|
146 $ cd ../a |
|
147 |
|
148 $ hg debugpushkey http://localhost:$HGPORT/ namespaces |
|
149 bookmarks |
|
150 namespaces |
|
151 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
|
152 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
153 X 9b140be1080824d768c5a4691a564088eede71f9 |
|
154 foo 0000000000000000000000000000000000000000 |
|
155 foobar 0000000000000000000000000000000000000000 |
|
156 $ hg out -B http://localhost:$HGPORT/ |
|
157 comparing with http://localhost:$HGPORT/ |
|
158 searching for changed bookmarks |
|
159 Z 0d2164f0ce0d |
|
160 $ hg push -B Z http://localhost:$HGPORT/ |
|
161 pushing to http://localhost:$HGPORT/ |
|
162 searching for changes |
|
163 no changes found |
|
164 exporting bookmark Z |
|
165 $ hg book -d Z |
|
166 $ hg in -B http://localhost:$HGPORT/ |
|
167 comparing with http://localhost:$HGPORT/ |
|
168 searching for changed bookmarks |
|
169 Z 0d2164f0ce0d |
|
170 foo 000000000000 |
|
171 foobar 000000000000 |
|
172 $ hg pull -B Z http://localhost:$HGPORT/ |
|
173 pulling from http://localhost:$HGPORT/ |
|
174 searching for changes |
|
175 no changes found |
|
176 not updating divergent bookmark X |
|
177 importing bookmark Z |
|
178 |
|
179 $ kill `cat ../hg.pid` |