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

r37434:7542e97c default


                r38817:bb54db4a

@96 default

Download file

             test-permissions.t
        
                    79 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-permissions.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require unix-permissions no-root reporevlogstore

        $ hg init t

        $ cd t

        $ echo foo > a

        $ hg add a

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ chmod -r .hg/store/data/a.i

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i

        [255]

        $ chmod +r .hg/store/data/a.i

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ chmod -w .hg/store/data/a.i

        $ echo barber > a

        $ hg commit -m "2"

        trouble committing a!

        abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i

        [255]

        $ chmod -w .

        $ hg diff --nodates

        diff -r 2a18120dc1c9 a

        --- a/a

        +++ b/a

        @@ -1,1 +1,1 @@

        -foo

        +barber

        $ chmod +w .

        $ chmod +w .hg/store/data/a.i

        $ mkdir dir

        $ touch dir/a

        $ hg status

        M a

        ? dir/a

        $ chmod -rx dir

      #if no-fsmonitor

      (fsmonitor makes "hg status" avoid accessing to "dir")

        $ hg status

        dir: Permission denied

        M a

      #endif

      Reenable perm to allow deletion:

        $ chmod +rx dir

        $ 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 unix-permissions no-root reporevlogstore

				$ hg init t
				$ cd t

				$ echo foo > a
				$ hg add a

				$ hg commit -m "1"

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

				$ chmod -r .hg/store/data/a.i

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
				[255]

				$ chmod +r .hg/store/data/a.i

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

				$ chmod -w .hg/store/data/a.i

				$ echo barber > a
				$ hg commit -m "2"
				trouble committing a!
				abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
				[255]

				$ chmod -w .

				$ hg diff --nodates
				diff -r 2a18120dc1c9 a
				--- a/a
				+++ b/a
				@@ -1,1 +1,1 @@
				-foo
				+barber

				$ chmod +w .

				$ chmod +w .hg/store/data/a.i
				$ mkdir dir
				$ touch dir/a
				$ hg status
				M a
				? dir/a
				$ chmod -rx dir

				#if no-fsmonitor

				(fsmonitor makes "hg status" avoid accessing to "dir")

				$ hg status
				dir: Permission denied
				M a

				#endif

				Reenable perm to allow deletion:

				$ chmod +rx dir

				$ cd ..