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

r33289:abd7dedb default


                r38817:bb54db4a

@96 default

Download file

             test-sparse-fsmonitor.t
        
                    44 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-fsmonitor.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      This test doesn't yet work due to the way fsmonitor is integrated with test runner

        $ exit 80

      test sparse interaction with other extensions

        $ hg init myrepo

        $ cd myrepo

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > sparse=

        > strip=

        > EOF

      Test fsmonitor integration (if available)

      TODO: make fully isolated integration test a'la https://github.com/facebook/watchman/blob/master/tests/integration/WatchmanInstance.py

      (this one is using the systemwide watchman instance)

        $ touch .watchmanconfig

        $ echo "ignoredir1/" >> .hgignore

        $ hg commit -Am ignoredir1

        adding .hgignore

        $ echo "ignoredir2/" >> .hgignore

        $ hg commit -m ignoredir2

        $ hg sparse --reset

        $ hg sparse -I ignoredir1 -I ignoredir2 -I dir1

        $ mkdir ignoredir1 ignoredir2 dir1

        $ touch ignoredir1/file ignoredir2/file dir1/file

      Run status twice to compensate for a condition in fsmonitor where it will check

      ignored files the second time it runs, regardless of previous state (ask @sid0)

        $ hg status --config extensions.fsmonitor=

        ? dir1/file

        $ hg status --config extensions.fsmonitor=

        ? dir1/file

      Test that fsmonitor ignore hash check updates when .hgignore changes

        $ hg up -q ".^"

        $ hg status --config extensions.fsmonitor=

        ? dir1/file

        ? ignoredir2/file

	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

				This test doesn't yet work due to the way fsmonitor is integrated with test runner

				$ exit 80

				test sparse interaction with other extensions

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

				Test fsmonitor integration (if available)
				TODO: make fully isolated integration test a'la https://github.com/facebook/watchman/blob/master/tests/integration/WatchmanInstance.py
				(this one is using the systemwide watchman instance)

				$ touch .watchmanconfig
				$ echo "ignoredir1/" >> .hgignore
				$ hg commit -Am ignoredir1
				adding .hgignore
				$ echo "ignoredir2/" >> .hgignore
				$ hg commit -m ignoredir2

				$ hg sparse --reset
				$ hg sparse -I ignoredir1 -I ignoredir2 -I dir1

				$ mkdir ignoredir1 ignoredir2 dir1
				$ touch ignoredir1/file ignoredir2/file dir1/file

				Run status twice to compensate for a condition in fsmonitor where it will check
				ignored files the second time it runs, regardless of previous state (ask @sid0)
				$ hg status --config extensions.fsmonitor=
				? dir1/file
				$ hg status --config extensions.fsmonitor=
				? dir1/file

				Test that fsmonitor ignore hash check updates when .hgignore changes

				$ hg up -q ".^"
				$ hg status --config extensions.fsmonitor=
				? dir1/file
				? ignoredir2/file