##// END OF EJS Templates
auth: don't break hashing in case of user with empty password....
auth: don't break hashing in case of user with empty password. In some cases such as LDAP user created via external scripts users might set the passwords to empty. The hashing uses the md5(password_hash) to store reference to detect password changes and forbid using the same password. In case of pure LDAP users this is not valid, and we shouldn't raise Errors in such case. This change makes it work for empty passwords now.

File last commit:

r1:854a839a default
r2203:8a18c3c3 default
Show More
branching-vs-bookmarking.rst
41 lines | 1.3 KiB | text/x-rst | RstLexer
/ docs / tutorials / branching-vs-bookmarking.rst

|hg| Branching Vs Bookmarking

If you wish to use the branching workflow in |hg|, as mentioned in the :ref:`workflow` section, then there is a subtle but important difference to note between what branching means in |git| and |hg|.

  • |hg| stores branch information as a permanent part of each commit. Each branch needs to be named and is assigned persistent symbolic links inside the |repo|.
  • In |git|, by contrast, a branch is simply a lightweight movable pointer to a commit.

This is where bookmarks replicate the |git| branch functionality in |hg|. A bookmark is a references to a commit that can be automatically updated when new commits are made. For more information, see the Mercurial Bookmark documentation.

To use |hg| bookmarks like |git| branches, see the following example.

# Make a bookmark particular revision
$ hg bookmark -r 3400 my-bookmark

# push the bookmark to the server
$ hg push -B my-bookmark

# Delete remote bookmark, by deleting locally, then push deletion
$ hg bookmark -d my-bookmark
$ hg push -B my-bookmark

To open a |pr| from a bookmark using |RCE|, use the usual |pr| steps.

../images/pr-from-bookmark.png