upstream/mercurial-mirror Files · rust/Cargo.toml

tests: demonstrate how continuing rebase after upgrade can result in merge...

tests: demonstrate how continuing rebase after upgrade can result in merge If the user starts a rebase with an hg version before (rebase: don't use rebased node as dirstate p2 (BC), 2020-01-10) and then runs into conflicts, they will be dropped out to the shell with the rebased node set as the dirstate's second parent. If they then upgrade to a later hg version, it will respect the dirstate's parents and will create a merge commit even if the user was rebasing a non-merge commit. Differential Revision: https://phab.mercurial-scm.org/D8355

Gregory Szorc - - Load All Authors

File last commit:

r45128:af739894 default


                r45156:e89b3603

default

Download file

             Cargo.toml
        
                    3 lines
            
             | 75 B
            
                | text/plain
            
             |
                TOMLLexer
            
             / rust / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [workspace]

      members = ["hg-core", "hg-cpython"]

      exclude = ["chg", "hgcli"]

	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

				[workspace]
				members = ["hg-core", "hg-cpython"]
				exclude = ["chg", "hgcli"]