upstream/mercurial-mirror Files · .editorconfig

rebase: move bookmarks with --keep (issue5682)...

rebase: move bookmarks with --keep (issue5682) This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727

Jun Wu - - Load All Authors

File last commit:

r28793:d30fdd6d default


                r34364:2f427b57

4.3.3 stable

Download file

             .editorconfig
        
                    13 lines
            
             | 220 B
            
                | text/x-ini
            
             |
                IniLexer
            
             / .editorconfig
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # See http://EditorConfig.org for the specification

      root = true

      [*.py]

      indent_size = 4

      indent_style = space

      trim_trailing_whitespace = true

      [*.{c,h}]

      indent_size = 8

      indent_style = tab

      trim_trailing_whitespace = true

	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

				# See http://EditorConfig.org for the specification

				root = true

				[*.py]
				indent_size = 4
				indent_style = space
				trim_trailing_whitespace = true

				[*.{c,h}]
				indent_size = 8
				indent_style = tab
				trim_trailing_whitespace = true