rhodecode-enterprise-ce Files · docs/tutorials/branching-vs-bookmarking.rst

shadow-repos: use safer way to destroy shadow repositories....

shadow-repos: use safer way to destroy shadow repositories. we had reported errors on removal of shadow repos. Not reproduced, however suspecting are filesystem sync/symlink race-conditions on shared storage. End result were existing shadow-repo directories that tricked rhodecode into thinking shadow repos is existing, but infact it was a dummy structure semi-removed. Using shutil.move we ENSURE rhodecode doesn't read those back even if removal fails.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r2777:f1cc2e3d

default

Download file

             branching-vs-bookmarking.rst
        
                    41 lines
            
             | 1.3 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / docs / tutorials / branching-vs-bookmarking.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      .. _bvb:

      |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.

      .. code-block:: bash

        # 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.

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

      .. _Mercurial Bookmark: https://mercurial.selenic.com/wiki/Bookmarks

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink project: added all source files and assets	r1	.. _bvb:

		\|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.

		.. code-block:: bash

		# 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.

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

		.. _Mercurial Bookmark: https://mercurial.selenic.com/wiki/Bookmarks