comparison tests/test-bookmarks-pushpull.t @ 44372:8407031f195f

bookmarks: prevent pushes of divergent bookmarks (foo@remote) Before this change, such bookmarks are write-only: a client can push them but not pull/read them. And because these bookmark can't be read, even pushes are limited (for instance trying to delete such a bookmark fails with a vanilla client because the client thinks the bookmark is neither on the local nor the remote). This change makes the server refuses such bookmarks, and for earlier errors, makes the client refuse to send them. I think the change of behavior is acceptable because I think this is a bug in push/pull, and I don't think we change the behavior of `hg unbundle`, because it doesn't seem that `hg bundle` ever store bookmarks (and even if it did, it would seem weird anyway to try to send divergent bookmarks). Differential Revision: https://phab.mercurial-scm.org/D8117
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
date Thu, 13 Feb 2020 22:51:17 -0500
parents 181ee2118a96
children edc8504bc26b
comparison
equal deleted inserted replaced
44371:0275000564c4 44372:8407031f195f
326 listing keys for "phases" 326 listing keys for "phases"
327 [1] 327 [1]
328 328
329 #endif 329 #endif
330 330
331 Divergent bookmark cannot be exported
332
333 $ hg book W@default
334 $ hg push -B W@default ../a
335 pushing to ../a
336 searching for changes
337 cannot push divergent bookmark W@default!
338 no changes found
339 [2]
340 $ hg book -d W@default
341
331 export the active bookmark 342 export the active bookmark
332 343
333 $ hg bookmark V 344 $ hg bookmark V
334 $ hg push -B . ../a 345 $ hg push -B . ../a
335 pushing to ../a 346 pushing to ../a