equal
deleted
inserted
replaced
52 phases |
52 phases |
53 $ hg debugpushkey ../a bookmarks |
53 $ hg debugpushkey ../a bookmarks |
54 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
54 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
55 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
55 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
56 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
56 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
57 |
|
58 delete the bookmark to repull it |
|
59 |
|
60 $ hg book -d X |
|
61 $ hg pull -B X ../a |
|
62 pulling from ../a |
|
63 no changes found |
|
64 adding remote bookmark X |
|
65 |
|
66 finally no-op pull |
|
67 |
57 $ hg pull -B X ../a |
68 $ hg pull -B X ../a |
58 pulling from ../a |
69 pulling from ../a |
59 no changes found |
70 no changes found |
60 $ hg bookmark |
71 $ hg bookmark |
61 X 0:4e3505fd9583 |
72 X 0:4e3505fd9583 |
163 $ hg -R ../a book |
174 $ hg -R ../a book |
164 @ 1:0d2164f0ce0d |
175 @ 1:0d2164f0ce0d |
165 * X 1:0d2164f0ce0d |
176 * X 1:0d2164f0ce0d |
166 Y 0:4e3505fd9583 |
177 Y 0:4e3505fd9583 |
167 Z 1:0d2164f0ce0d |
178 Z 1:0d2164f0ce0d |
|
179 |
|
180 explicite pull should overwrite the local version (issue4439) |
|
181 |
|
182 $ hg pull --config paths.foo=../a foo -B X |
|
183 pulling from $TESTTMP/a (glob) |
|
184 no changes found |
|
185 divergent bookmark @ stored as @foo |
|
186 importing bookmark X |
|
187 |
|
188 reinstall state for further testing: |
|
189 |
|
190 $ hg book -fr 9b140be10808 X |
168 |
191 |
169 revsets should not ignore divergent bookmarks |
192 revsets should not ignore divergent bookmarks |
170 |
193 |
171 $ hg bookmark -fr 1 Z |
194 $ hg bookmark -fr 1 Z |
172 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n' |
195 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n' |