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

strip: incrementally update the branchheads cache after a strip...

strip: incrementally update the branchheads cache after a strip This function augments strip to incrementally update the branchheads cache rather than recompute it from scratch. This speeds up the performance of strip and rebase on repos with long history. The performance optimization only happens if the revisions stripped are all on the same branch and the parents of the stripped revisions are also on that same branch. This adds a few test cases, particularly one that reproduces the extra heads that mpm observed.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r17013:c8eda7bb

default

Download file

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

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "graphlog=" >> $HGRCPATH

        $ 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

        $ 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

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "graphlog=" >> $HGRCPATH

				$ 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
				$ hg commit -m "Merged"

				$ cd ..