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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r22118:9a299c39 default


                r22284:72b37865

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 working directory with another revision

         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 working directory with another revision
				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