Mercurial > hg
comparison CONTRIBUTORS @ 22364:5c153c69fdb2
bookmarks: allow pushkey if new equals current
Previously a bookmark pushkey would be rejected if the specified 'old' value
didn't match the servers 'current' value. This change allows this situation, as
long as the 'current' server value equals the 'new' pushkey value already.
We are trying to write a hook that forces a server bookmark to move forward,
using a changegroup hook. If the user also pushed the bookmark, they would get
an error, since they computed their pushkey (old,new) pair before the server
moved the bookmark. Long term, bundle2 will let us do this more smartly, but
this change seems reasonable for now.
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 26 Aug 2014 04:58:41 -0700 |
parents | c29efd272395 |
children |
comparison
equal
deleted
inserted
replaced
22363:9510b0e9480b | 22364:5c153c69fdb2 |
---|