upstream/mercurial-mirror Files · tests/test-strict.t

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

anatoly techtonik - - Load All Authors

File last commit:

r23400:3bd577a3 stable


                r28189:fac3a24b

default

Download file

             test-strict.t
        
                    48 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-strict.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg an a

        0: a

        $ hg --config ui.strict=False an a

        0: a

        $ echo "[ui]" >> $HGRCPATH

        $ echo "strict=True" >> $HGRCPATH

        $ hg an a

        hg: unknown command 'an'

        Mercurial Distributed SCM

        basic commands:

         add           add the specified files on the next commit

         annotate      show changeset information by line for each file

         clone         make a copy of an existing repository

         commit        commit the specified files or all outstanding changes

         diff          diff repository (or selected files)

         export        dump the header and diffs for one or more changesets

         forget        forget the specified files on the next commit

         init          create a new repository in the given directory

         log           show revision history of entire repository or files

         merge         merge another revision into working directory

         pull          pull changes from the specified source

         push          push changes to the specified destination

         remove        remove the specified files on the next commit

         serve         start stand-alone webserver

         status        show changed files in the working directory

         summary       summarize working directory state

         update        update working directory (or switch revisions)

        (use "hg help" for the full list of commands or "hg -v" for details)

        [255]

        $ hg annotate a

        0: a

      should succeed - up is an alias, not an abbreviation

        $ hg up

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	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

				$ hg init

				$ echo a > a
				$ hg ci -Ama
				adding a

				$ hg an a
				0: a

				$ hg --config ui.strict=False an a
				0: a

				$ echo "[ui]" >> $HGRCPATH
				$ echo "strict=True" >> $HGRCPATH

				$ hg an a
				hg: unknown command 'an'
				Mercurial Distributed SCM

				basic commands:

				add add the specified files on the next commit
				annotate show changeset information by line for each file
				clone make a copy of an existing repository
				commit commit the specified files or all outstanding changes
				diff diff repository (or selected files)
				export dump the header and diffs for one or more changesets
				forget forget the specified files on the next commit
				init create a new repository in the given directory
				log show revision history of entire repository or files
				merge merge another revision into working directory
				pull pull changes from the specified source
				push push changes to the specified destination
				remove remove the specified files on the next commit
				serve start stand-alone webserver
				status show changed files in the working directory
				summary summarize working directory state
				update update working directory (or switch revisions)

				(use "hg help" for the full list of commands or "hg -v" for details)
				[255]
				$ hg annotate a
				0: a

				should succeed - up is an alias, not an abbreviation

				$ hg up
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved