upstream/mercurial-mirror Files · tests/test-narrow-merge-tree.t

narrow: assume addflagprocessor will always exist on revlog module...

narrow: assume addflagprocessor will always exist on revlog module Differential Revision: https://phab.mercurial-scm.org/D1978

Augie Fackler - - Load All Authors

File last commit:

r36096:a2a6e724 default


                r36100:9772ef9f

default

Download file

             test-narrow-merge-tree.t
        
                    28 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-merge-tree.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \

        >   --extra-config-opt experimental.treemanifest=1 test-narrow-merge.t 2>&1 | \

        > grep -v 'unexpected mercurial lib' | egrep -v '\(expected'

        --- */tests/test-narrow-merge.t (glob)

        +++ */tests/test-narrow-merge.t.err (glob)

        @@ -\d+,\d+ \+\d+,\d+ @@ (re)

           $ hg update -q 'desc("modify inside/f1")'

           $ hg merge 'desc("modify outside/f1")'

        -  abort: merge affects file 'outside/f1' outside narrow, which is not yet supported

        +  abort: merge affects file 'outside/' outside narrow, which is not yet supported

           (merging in the other direction may work)

           [255]

        @@ -\d+,\d+ \+\d+,\d+ @@ (re)

           $ hg update -q 'desc("modify outside/f1")'

           $ hg merge 'desc("conflicting outside/f1")'

        -  abort: conflict in file 'outside/f1' is outside narrow clone

        +  abort: conflict in file 'outside/' is outside narrow clone

           [255]

        ERROR: test-narrow-merge.t output changed

        !

        Failed test-narrow-merge.t: output changed

        # Ran 1 tests, 0 skipped, 1 failed.

        python hash seed: * (glob)

	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

				$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
				> --extra-config-opt experimental.treemanifest=1 test-narrow-merge.t 2>&1 \| \
				> grep -v 'unexpected mercurial lib' \| egrep -v '\(expected'

				--- */tests/test-narrow-merge.t (glob)
				+++ */tests/test-narrow-merge.t.err (glob)
				@@ -\d+,\d+ \+\d+,\d+ @@ (re)

				$ hg update -q 'desc("modify inside/f1")'
				$ hg merge 'desc("modify outside/f1")'
				- abort: merge affects file 'outside/f1' outside narrow, which is not yet supported
				+ abort: merge affects file 'outside/' outside narrow, which is not yet supported
				(merging in the other direction may work)
				[255]

				@@ -\d+,\d+ \+\d+,\d+ @@ (re)

				$ hg update -q 'desc("modify outside/f1")'
				$ hg merge 'desc("conflicting outside/f1")'
				- abort: conflict in file 'outside/f1' is outside narrow clone
				+ abort: conflict in file 'outside/' is outside narrow clone
				[255]

				ERROR: test-narrow-merge.t output changed
				!
				Failed test-narrow-merge.t: output changed
				# Ran 1 tests, 0 skipped, 1 failed.
				python hash seed: * (glob)