upstream/mercurial-mirror Files · tests/test-merge9.t

run-tests: make _processoutput picky about optional globs...

run-tests: make _processoutput picky about optional globs enabled lines that were not matched to be found later in cases of jitter. Unfortunately, in this model an optional line would always jitter to the end when it is not present. That is not ideal. It would be possible to do better, by queuing all writes until the end in case an optional line jitters, but for now, it is simpler to assume optional lines have a fixed place in the stream.

Siddharth Agarwal - - Load All Authors

File last commit:

r26618:8e6d5b73 default


                r28701:3bce3d2f

default

Download file

             test-merge9.t
        
                    94 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge9.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test that we don't interrupt the merge session if

      a file-level merge failed

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ echo a > bar

        $ hg ci -Am 'add foo'

        adding bar

        adding foo

        $ hg mv foo baz

        $ echo b >> bar

        $ echo quux > quux1

        $ hg ci -Am 'mv foo baz'

        adding quux1

        $ hg up -qC 0

        $ echo >> foo

        $ echo c >> bar

        $ echo quux > quux2

        $ hg ci -Am 'change foo'

        adding quux2

        created new head

      test with the rename on the remote side

        $ HGMERGE=false hg merge

        merging bar

        merging foo and baz to baz

        merging bar failed!

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ hg resolve -l

        U bar

        R baz

      test with the rename on the local side

        $ hg up -C 1

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

        $ HGMERGE=false hg merge

        merging bar

        merging baz and foo to baz

        merging bar failed!

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      show unresolved

        $ hg resolve -l

        U bar

        R baz

      unmark baz

        $ hg resolve -u baz

      show

        $ hg resolve -l

        U bar

        U baz

        $ hg st

        M bar

        M baz

        M quux2

        ? bar.orig

      re-resolve baz

        $ hg resolve baz

        merging baz and foo to baz

      after resolve

        $ hg resolve -l

        U bar

        R baz

      resolve all warning

        $ hg resolve

        abort: no files or directories specified

        (use --all to re-merge all unresolved files)

        [255]

      resolve all

        $ hg resolve -a

        merging bar

        warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')

        [1]

      after

        $ hg resolve -l

        U bar

        R baz

        $ 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

				test that we don't interrupt the merge session if
				a file-level merge failed

				$ hg init repo
				$ cd repo

				$ echo foo > foo
				$ echo a > bar
				$ hg ci -Am 'add foo'
				adding bar
				adding foo

				$ hg mv foo baz
				$ echo b >> bar
				$ echo quux > quux1
				$ hg ci -Am 'mv foo baz'
				adding quux1

				$ hg up -qC 0
				$ echo >> foo
				$ echo c >> bar
				$ echo quux > quux2
				$ hg ci -Am 'change foo'
				adding quux2
				created new head

				test with the rename on the remote side
				$ HGMERGE=false hg merge
				merging bar
				merging foo and baz to baz
				merging bar failed!
				1 files updated, 1 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]
				$ hg resolve -l
				U bar
				R baz

				test with the rename on the local side
				$ hg up -C 1
				3 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ HGMERGE=false hg merge
				merging bar
				merging baz and foo to baz
				merging bar failed!
				1 files updated, 1 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				show unresolved
				$ hg resolve -l
				U bar
				R baz

				unmark baz
				$ hg resolve -u baz

				show
				$ hg resolve -l
				U bar
				U baz
				$ hg st
				M bar
				M baz
				M quux2
				? bar.orig

				re-resolve baz
				$ hg resolve baz
				merging baz and foo to baz

				after resolve
				$ hg resolve -l
				U bar
				R baz

				resolve all warning
				$ hg resolve
				abort: no files or directories specified
				(use --all to re-merge all unresolved files)
				[255]

				resolve all
				$ hg resolve -a
				merging bar
				warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
				[1]

				after
				$ hg resolve -l
				U bar
				R baz

				$ cd ..