Show More
@@ -390,7 +390,7 b' def updatefromremote(ui, repo, remotemar' | |||||
390 | if b in explicit: |
|
390 | if b in explicit: | |
391 | explicit.discard(b) |
|
391 | explicit.discard(b) | |
392 | changed.append((b, bin(scid), status, |
|
392 | changed.append((b, bin(scid), status, | |
393 |
_("importing bookmark %s\n") % (b |
|
393 | _("importing bookmark %s\n") % (b))) | |
394 | else: |
|
394 | else: | |
395 | db = _diverge(ui, b, path, localmarks) |
|
395 | db = _diverge(ui, b, path, localmarks) | |
396 | changed.append((db, bin(scid), warn, |
|
396 | changed.append((db, bin(scid), warn, | |
@@ -400,7 +400,7 b' def updatefromremote(ui, repo, remotemar' | |||||
400 | if b in explicit: |
|
400 | if b in explicit: | |
401 | explicit.discard(b) |
|
401 | explicit.discard(b) | |
402 | changed.append((b, bin(scid), status, |
|
402 | changed.append((b, bin(scid), status, | |
403 |
_("importing bookmark %s\n") % (b |
|
403 | _("importing bookmark %s\n") % (b))) | |
404 |
|
404 | |||
405 | if changed: |
|
405 | if changed: | |
406 | tr = trfunc() |
|
406 | tr = trfunc() |
@@ -54,6 +54,17 b' import bookmark by name' | |||||
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 | |
@@ -166,6 +177,18 b' divergent bookmarks' | |||||
166 | Y 0:4e3505fd9583 |
|
177 | Y 0:4e3505fd9583 | |
167 | Z 1:0d2164f0ce0d |
|
178 | Z 1:0d2164f0ce0d | |
168 |
|
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 | |||
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now