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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Yuya Nishihara - - Load All Authors

File last commit:

r38561:ece3f2d0 default


                r38817:bb54db4a

@96 default

Download file

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

      Source bundle was generated with the following script:

      # hg init

      # echo a > a

      # ln -s a l

      # hg ci -Ama -d'0 0'

      # mkdir b

      # echo a > b/a

      # chmod +x b/a

      # hg ci -Amb -d'1 0'

        $ hg init

        $ hg unbundle "$TESTDIR/bundles/test-manifest.hg"

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 3 changes to 3 files

        new changesets b73562a03cfe:5bdc995175ba

        (run 'hg update' to get a working copy)

      The next call is expected to return nothing:

        $ hg manifest

        $ hg co

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

        $ hg manifest

        a

        b/a

        l

        $ hg files -vr .

                 2   a

                 2 x b/a

                 1 l l

        $ hg files -r . -X b

        a

        l

        $ hg files -T '{path} {size} {flags}\n'

        a 2 

        b/a 2 x

        l 1 l

        $ hg files -T '{path} {node|shortest}\n' -r.

        a 5bdc

        b/a 5bdc

        l 5bdc

        $ hg manifest -v

        644   a

        755 * b/a

        644 @ l

        $ hg manifest -T '{path} {rev}\n'

        a 1

        b/a 1

        l 1

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a

        047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

        $ hg manifest -r 0

        a

        l

        $ hg manifest -r 1

        a

        b/a

        l

        $ hg manifest -r tip

        a

        b/a

        l

        $ hg manifest tip

        a

        b/a

        l

        $ hg manifest --all

        a

        b/a

        l

      The next two calls are expected to abort:

        $ hg manifest -r 2

        abort: unknown revision '2'!

        [255]

        $ hg manifest -r tip tip

        abort: please specify just one revision

        [255]

	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

				Source bundle was generated with the following script:

				# hg init
				# echo a > a
				# ln -s a l
				# hg ci -Ama -d'0 0'
				# mkdir b
				# echo a > b/a
				# chmod +x b/a
				# hg ci -Amb -d'1 0'

				$ hg init
				$ hg unbundle "$TESTDIR/bundles/test-manifest.hg"
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 3 changes to 3 files
				new changesets b73562a03cfe:5bdc995175ba
				(run 'hg update' to get a working copy)

				The next call is expected to return nothing:

				$ hg manifest

				$ hg co
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg manifest
				a
				b/a
				l

				$ hg files -vr .
				2 a
				2 x b/a
				1 l l
				$ hg files -r . -X b
				a
				l
				$ hg files -T '{path} {size} {flags}\n'
				a 2
				b/a 2 x
				l 1 l
				$ hg files -T '{path} {node\|shortest}\n' -r.
				a 5bdc
				b/a 5bdc
				l 5bdc

				$ hg manifest -v
				644 a
				755 * b/a
				644 @ l
				$ hg manifest -T '{path} {rev}\n'
				a 1
				b/a 1
				l 1

				$ hg manifest --debug
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
				047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

				$ hg manifest -r 0
				a
				l

				$ hg manifest -r 1
				a
				b/a
				l

				$ hg manifest -r tip
				a
				b/a
				l

				$ hg manifest tip
				a
				b/a
				l

				$ hg manifest --all
				a
				b/a
				l

				The next two calls are expected to abort:

				$ hg manifest -r 2
				abort: unknown revision '2'!
				[255]

				$ hg manifest -r tip tip
				abort: please specify just one revision
				[255]