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

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r38817:bb54db4a

@96 default

Download file

             test-pull-permission.t
        
                    33 lines
            
             | 655 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-permission.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: change some #ifs to #requires

              r22047
            
      #require unix-permissions no-root

        Mads Kiilerich
    
tests: add missing 'hghave unix-permissions'

              r15516
            
        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init a

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd a

        $ echo foo > b

        $ hg add b

        $ hg ci -m "b"

        $ chmod -w .hg/store

        $ cd ..

        $ hg clone a b

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets 97310831fa1a

        Adrian Buehlmann
    
combine tests

              r12279
            
        updating to branch default

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

        $ chmod +w a/.hg/store # let test clean up

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: change some #ifs to #requires	r22047	#require unix-permissions no-root
Mads Kiilerich tests: add missing 'hghave unix-permissions'	r15516
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init a
Adrian Buehlmann combine tests	r12279	$ cd a
		$ echo foo > b
		$ hg add b
		$ hg ci -m "b"

		$ chmod -w .hg/store

		$ cd ..

		$ hg clone a b
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets 97310831fa1a
Adrian Buehlmann combine tests	r12279	updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ chmod +w a/.hg/store # let test clean up

		$ cd b
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..