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

r37440:9fa4a1fd default


                r38817:bb54db4a

@96 default

Download file

             test-hgweb-bundle.t
        
                    37 lines
            
             | 788 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgweb-bundle.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve repobundlerepo

        $ hg init server

        $ cd server

        $ cat >> .hg/hgrc << EOF

        > [extensions]

        > strip=

        > EOF

        $ echo 1 > foo

        $ hg commit -A -m 'first'

        adding foo

        $ echo 2 > bar

        $ hg commit -A -m 'second'

        adding bar

      Produce a bundle to use

        $ hg strip -r 1

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg

      Serve from a bundle file

        $ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid

        $ cat hg.pid >> $DAEMON_PIDS

      Ensure we're serving from the bundle

        $ (get-with-headers.py localhost:$HGPORT 'file/tip/?style=raw')

        200 Script output follows

        -rw-r--r-- 2 bar

        -rw-r--r-- 2 foo

	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 repobundlerepo

				$ hg init server
				$ cd server
				$ cat >> .hg/hgrc << EOF
				> [extensions]
				> strip=
				> EOF

				$ echo 1 > foo
				$ hg commit -A -m 'first'
				adding foo
				$ echo 2 > bar
				$ hg commit -A -m 'second'
				adding bar

				Produce a bundle to use

				$ hg strip -r 1
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg

				Serve from a bundle file

				$ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid
				$ cat hg.pid >> $DAEMON_PIDS

				Ensure we're serving from the bundle

				$ (get-with-headers.py localhost:$HGPORT 'file/tip/?style=raw')
				200 Script output follows


				-rw-r--r-- 2 bar
				-rw-r--r-- 2 foo