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

Siddharth Agarwal - - Load All Authors

File last commit:

r19929:ab2362e1 default


                r38817:bb54db4a

@96 default

Download file

             test-empty.t
        
                    53 lines
            
             | 820 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-empty.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Create an empty repo:

        $ hg init a

        $ cd a

      Try some commands:

        $ hg log

        $ hg grep wah

        [1]

        $ hg manifest

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

      Check the basic files created:

        $ ls .hg

        00changelog.i

        requires

        store

      Should be empty:

        $ ls .hg/store

      Poke at a clone:

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

        $ ls .hg

        00changelog.i

        hgrc

        requires

        store

      Should be empty:

        $ ls .hg/store

        $ 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

				Create an empty repo:

				$ hg init a
				$ cd a

				Try some commands:

				$ hg log
				$ hg grep wah
				[1]
				$ hg manifest
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions

				Check the basic files created:

				$ ls .hg
				00changelog.i
				requires
				store

				Should be empty:

				$ ls .hg/store

				Poke at a clone:

				$ cd ..
				$ hg clone a b
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd b
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions
				$ ls .hg
				00changelog.i
				hgrc
				requires
				store

				Should be empty:

				$ ls .hg/store

				$ cd ..