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

Matt Mackall - - Load All Authors

File last commit:

r25472:4d2b9b30 default


                r38817:bb54db4a

@96 default

Download file

             test-websub.t
        
                    36 lines
            
             | 893 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-websub.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve

        $ hg init test

        $ cd test

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > # this is only necessary to check that the mapping from

        > # interhg to websub works

        > interhg =

        > 

        > [websub]

        > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|

        > 

        > [interhg]

        > # check that we maintain some interhg backwards compatibility...

        > # yes, 'x' is a weird delimiter...

        > markbugs = sxbugx<i class="\x">bug</i>x

        > EOF

        $ touch foo

        $ hg add foo

        $ hg commit -d '1 0' -m 'Issue123: fixed the bug!'

        $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

      log

        $ get-with-headers.py localhost:$HGPORT "rev/tip" | grep bts

        <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div>

      errors

        $ cat errors.log

        $ 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

				#require serve

				$ hg init test
				$ cd test

				$ cat > .hg/hgrc <<EOF
				> [extensions]
				> # this is only necessary to check that the mapping from
				> # interhg to websub works
				> interhg =
				>
				> [websub]
				> issues = s\|Issue(\d+)\|<a href="http://bts.example.org/issue\1">Issue\1</a>\|
				>
				> [interhg]
				> # check that we maintain some interhg backwards compatibility...
				> # yes, 'x' is a weird delimiter...
				> markbugs = sxbugx<i class="\x">bug</i>x
				> EOF

				$ touch foo
				$ hg add foo
				$ hg commit -d '1 0' -m 'Issue123: fixed the bug!'

				$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS

				log

				$ get-with-headers.py localhost:$HGPORT "rev/tip" \| grep bts
				<div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div>
				errors

				$ cat errors.log

				$ cd ..