D6776: bookmarks: validate changes on push (issue6193) (BC)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I agree with @valentin.gatienbaron that `--force` is quite generic :(.  It may create new heads on the server even if I don't want to.

INLINE COMMENTS

> bundle2.py:2149
> +                        hint=
> +                        _("run 'hg pull', resolve conflicts, and push again"))
> +            hookargs = tr.hookargs.copy()

Hm, I think `conflicts` can be confusing but I don't have better suggestions here.

> repository.py:194
>  
> -    def unbundle(bundle, heads, url):
> +    def unbundle(bundle, heads, url, force=None):
>          """Transfer repository data to the peer.

It will be nice to have documentation about what `force` does in the interface.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6776/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6776

To: idlsoft, #hg-reviewers, durin42
Cc: pulkit, durin42, valentin.gatienbaron, mercurial-devel