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

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Wagner Bruna - - Load All Authors

File last commit:

r23917:3cbb5bf4 default


                r25590:183965a0

default

Download file

             test-commit-unresolved.t
        
                    47 lines
            
             | 1.0 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 during merge.

        merging A incomplete! (edit conflicts, 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"

        $ 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 during merge.
				merging A incomplete! (edit conflicts, 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"

				$ cd ..