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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

timeless - - Load All Authors

File last commit:

r29974:7109d5dd default


                r32255:7e35d31b

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