upstream/mercurial-mirror Files · tests/test-commit-unresolved.t

match: move entire uipath() implementation to basematcher...

match: move entire uipath() implementation to basematcher Even though most matchers will always want to use the relative path in uipath(), when we add support for intersecting matcher, we will want to control which form to use for any kind of matcher without knowing the type (see next patch), so we need the implementation on the base class. Also rename the attribute from "pathrestricted" to "relativeuipath" since there actually are cases where we match everything but still use relative paths (like when the user runs "hg files .." from inside mercurial/).

timeless - - Load All Authors

File last commit:

r29975:c15f0610 default


                r32496:ca77a243

default

Download file

             test-commit-unresolved.t
        
                    67 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-commit-unresolved.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ addcommit () {

        >     echo $1 > $1

        >     hg add $1

        >     hg commit -d "${2} 0" -m $1

        > }

        $ commit () {

        >     hg commit -d "${2} 0" -m $1

        > }

        $ hg init a

        $ cd a

        $ addcommit "A" 0

        $ addcommit "B" 1

        $ echo "C" >> A

        $ commit "C" 2

        $ hg update -C 0

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

        $ echo "D" >> A

        $ commit "D" 3

        created new head

      Merging a conflict araises

        $ hg merge

        merging A

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

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

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

        [1]

      Correct the conflict without marking the file as resolved

        $ echo "ABCD" > A

        $ hg commit -m "Merged"

        abort: unresolved merge conflicts (see 'hg help resolve')

        [255]

      Mark the conflict as resolved and commit

        $ hg resolve -m A

        (no more unresolved files)

        $ hg commit -m "Merged"

      Test that if a file is removed but not marked resolved, the commit still fails

      (issue4972)

        $ hg up ".^"

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

        $ hg merge 2

        merging A

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

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

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

        [1]

        $ hg rm --force A

        $ hg commit -m merged

        abort: unresolved merge conflicts (see 'hg help resolve')

        [255]

        $ hg resolve -ma

        (no more unresolved files)

        $ hg commit -m merged

        created new head

        $ 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

				$ addcommit () {
				> echo $1 > $1
				> hg add $1
				> hg commit -d "${2} 0" -m $1
				> }

				$ commit () {
				> hg commit -d "${2} 0" -m $1
				> }

				$ hg init a
				$ cd a
				$ addcommit "A" 0
				$ addcommit "B" 1
				$ echo "C" >> A
				$ commit "C" 2

				$ hg update -C 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo "D" >> A
				$ commit "D" 3
				created new head

				Merging a conflict araises

				$ hg merge
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				Correct the conflict without marking the file as resolved

				$ echo "ABCD" > A
				$ hg commit -m "Merged"
				abort: unresolved merge conflicts (see 'hg help resolve')
				[255]

				Mark the conflict as resolved and commit

				$ hg resolve -m A
				(no more unresolved files)
				$ hg commit -m "Merged"

				Test that if a file is removed but not marked resolved, the commit still fails
				(issue4972)

				$ hg up ".^"
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg merge 2
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]
				$ hg rm --force A
				$ hg commit -m merged
				abort: unresolved merge conflicts (see 'hg help resolve')
				[255]

				$ hg resolve -ma
				(no more unresolved files)
				$ hg commit -m merged
				created new head

				$ cd ..