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

Gregory Szorc - - Load All Authors

File last commit:

r37864:b4b7427b default


                r38817:bb54db4a

@96 default

Download file

             test-known.t
        
                    37 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-known.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      = Test the known() protocol function =

      Create a test repository:

        $ hg init repo

        $ cd repo

        $ touch a ; hg add a ; hg ci -ma

        $ touch b ; hg add b ; hg ci -mb

        $ touch c ; hg add c ; hg ci -mc

        $ hg log --template '{node}\n'

        991a3460af53952d10ec8a295d3d2cc2e5fa9690

        0e067c57feba1a5694ca4844f05588bb1bf82342

        3903775176ed42b1458a6281db4a0ccf4d9f287a

        $ cd ..

      Test locally:

        $ hg debugknown repo 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a

        111

        $ hg debugknown repo 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a

        010

        $ hg debugknown repo

      Test via HTTP:

        $ hg serve -R repo -p $HGPORT -d --pid-file=hg.pid -E error.log -A access.log

        $ cat hg.pid >> $DAEMON_PIDS

        $ hg debugknown http://localhost:$HGPORT/ 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a

        111

        $ hg debugknown http://localhost:$HGPORT/ 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a

        010

        $ hg debugknown http://localhost:$HGPORT/

        $ cat error.log

        $ killdaemons.py

	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

				= Test the known() protocol function =

				Create a test repository:

				$ hg init repo
				$ cd repo
				$ touch a ; hg add a ; hg ci -ma
				$ touch b ; hg add b ; hg ci -mb
				$ touch c ; hg add c ; hg ci -mc
				$ hg log --template '{node}\n'
				991a3460af53952d10ec8a295d3d2cc2e5fa9690
				0e067c57feba1a5694ca4844f05588bb1bf82342
				3903775176ed42b1458a6281db4a0ccf4d9f287a
				$ cd ..

				Test locally:

				$ hg debugknown repo 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a
				111
				$ hg debugknown repo 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a
				010
				$ hg debugknown repo


				Test via HTTP:

				$ hg serve -R repo -p $HGPORT -d --pid-file=hg.pid -E error.log -A access.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg debugknown http://localhost:$HGPORT/ 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a
				111
				$ hg debugknown http://localhost:$HGPORT/ 000a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0003775176ed42b1458a6281db4a0ccf4d9f287a
				010
				$ hg debugknown http://localhost:$HGPORT/

				$ cat error.log
				$ killdaemons.py