mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
810192fad4
Summary: The `remotebookmarks` field in the local commit cloud state should always be one of: * The empty set, if the previous sync was performed with remotebookmarks sync disabled; or * The cloud workspace's remote bookmarks for that version. Currently when processing remote bookmarks, we may store in the local state the outcome of conflict resolution for the remote bookmarks. This is the wrong thing to do, as it means we won't then upload those conflict resolutions as a new cloud version, which means they may get lost and rolled back. Change application of cloud remote bookmarks to store the cloud remote bookmarks in the local state, even if we changed them through conflict resolution. This means we will always upload the newly updated remote bookmarks to the server, and things will stay more in sync. Reviewed By: quark-zju Differential Revision: D27291238 fbshipit-source-id: 8e6a0ab150da5907d32b8127aa0e6ccb17df4eea |
||
|---|---|---|
| .. | ||
| contrib | ||
| distutils_rust | ||
| doc | ||
| edenscm | ||
| edenscmnative | ||
| exec | ||
| hgcache_size_logger | ||
| i18n | ||
| lib | ||
| newdoc | ||
| pystubs | ||
| slides | ||
| tests | ||
| .editorconfig | ||
| .flake8 | ||
| .gitignore | ||
| COPYING | ||
| gen_version.py | ||
| hgeditor | ||
| Makefile | ||
| README.rst | ||
| setup3.py | ||
| setup.py | ||
Mercurial ========= Mercurial is a fast, easy to use, distributed revision control tool for software developers. Basic install:: $ make # see install targets $ make install # do a system-wide install $ hg debuginstall # sanity-check setup $ hg # see help Running without installing:: $ make local # build for inplace usage $ ./hg --version # should show the latest version See https://mercurial-scm.org/ for detailed installation instructions, platform-specific notes, and Mercurial user information.