upstream/mercurial-mirror Files · tests/test-revset-dirstate-parents.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:

r34075:7bbc4e11 default


                r38817:bb54db4a

@96 default

Download file

             test-revset-dirstate-parents.t
        
                    66 lines
            
             | 880 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-dirstate-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ HGENCODING=utf-8

        $ export HGENCODING

        $ try() {

        >   hg debugrevspec --debug $@

        > }

        $ log() {

        >   hg log --template '{rev}\n' -r "$1"

        > }

        $ hg init repo

        $ cd repo

        $ try 'p1()'

        (func

          (symbol 'p1')

          None)

        * set:

        <baseset []>

        $ try 'p2()'

        (func

          (symbol 'p2')

          None)

        * set:

        <baseset []>

        $ try 'parents()'

        (func

          (symbol 'parents')

          None)

        * set:

        <baseset+ []>

      null revision

        $ log 'p1()'

        $ log 'p2()'

        $ log 'parents()'

      working dir with a single parent

        $ echo a > a

        $ hg ci -Aqm0

        $ log 'p1()'

        0

        $ log 'tag() and p1()'

        $ log 'p2()'

        $ log 'parents()'

        0

        $ log 'tag() and parents()'

      merge in progress

        $ echo b > b

        $ hg ci -Aqm1

        $ hg up -q 0

        $ echo c > c

        $ hg ci -Aqm2

        $ hg merge -q

        $ log 'p1()'

        2

        $ log 'p2()'

        1

        $ log 'tag() and p2()'

        $ log 'parents()'

        1

        2

        $ cd ..

	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

				$ HGENCODING=utf-8
				$ export HGENCODING

				$ try() {
				> hg debugrevspec --debug $@
				> }

				$ log() {
				> hg log --template '{rev}\n' -r "$1"
				> }

				$ hg init repo
				$ cd repo

				$ try 'p1()'
				(func
				(symbol 'p1')
				None)
				* set:
				<baseset []>
				$ try 'p2()'
				(func
				(symbol 'p2')
				None)
				* set:
				<baseset []>
				$ try 'parents()'
				(func
				(symbol 'parents')
				None)
				* set:
				<baseset+ []>

				null revision
				$ log 'p1()'
				$ log 'p2()'
				$ log 'parents()'

				working dir with a single parent
				$ echo a > a
				$ hg ci -Aqm0
				$ log 'p1()'
				0
				$ log 'tag() and p1()'
				$ log 'p2()'
				$ log 'parents()'
				0
				$ log 'tag() and parents()'

				merge in progress
				$ echo b > b
				$ hg ci -Aqm1
				$ hg up -q 0
				$ echo c > c
				$ hg ci -Aqm2
				$ hg merge -q
				$ log 'p1()'
				2
				$ log 'p2()'
				1
				$ log 'tag() and p2()'
				$ log 'parents()'
				1
				2

				$ cd ..