upstream/mercurial-mirror Files · tests/test-issue4074.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

Pulkit Goyal - - Load All Authors

File last commit:

r36305:57c671cf default


                r38817:bb54db4a

@96 default

Download file

             test-issue4074.t
        
                    29 lines
            
             | 508 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue4074.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-pure

      A script to generate nasty diff worst-case scenarios:

        $ cat > s.py <<EOF

        > import random

        > for x in range(100000):

        >     print

        >     if random.randint(0, 100) >= 50:

        >         x += 1

        >     print(hex(x))

        > EOF

        $ hg init a

        $ cd a

      Check in a big file:

        $ $PYTHON ../s.py > a

        $ hg ci -qAm0

      Modify it:

        $ $PYTHON ../s.py > a

      Time a check-in, should never take more than 10 seconds user time:

        $ hg ci --time -m1

        time: real .* secs .user [0-9][.].* sys .* (re)

	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

				#require no-pure

				A script to generate nasty diff worst-case scenarios:

				$ cat > s.py <<EOF
				> import random
				> for x in range(100000):
				> print
				> if random.randint(0, 100) >= 50:
				> x += 1
				> print(hex(x))
				> EOF

				$ hg init a
				$ cd a

				Check in a big file:

				$ $PYTHON ../s.py > a
				$ hg ci -qAm0

				Modify it:

				$ $PYTHON ../s.py > a

				Time a check-in, should never take more than 10 seconds user time:

				$ hg ci --time -m1
				time: real .* secs .user [0-9][.].* sys .* (re)