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

localrepo: strip now incrementally updates the branchheads cache...

localrepo: strip now incrementally updates the branchheads cache Destroying history via strip used to invalidate the branchheads cache, causing it to be regenerated the next time it is read. This is expensive in large repos. This change converts strip to pass info to localrepo.destroyed() to enable to it to incrementally update the cache, improving the performance of strip and other operations that depend on it (e.g., rebase). This change also strengthens a bit the integrity checking of the branchheads cache when it is read, by rejecting the cache if it has nodes in it that no longer exist.

Kevin Bullock - - Load All Authors

File last commit:

r15619:6c8573dd default


                r16716:0311a6ab

default

Download file

             test-merge-force.t
        
                    45 lines
            
             | 682 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-force.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-merge-force

              r12256
            
        $ hg init

        $ echo a > a

        $ hg ci -qAm 'add a'

        $ echo b > b

        $ hg ci -qAm 'add b'

        $ hg up -qC 0

        $ hg rm a

        $ hg ci -m 'rm a'

        created new head

        $ hg up -qC 1

        $ rm a

      Local deleted a file, remote removed

      Should fail, since there are deleted files:

        $ hg merge

        Kevin Bullock
    
merge: make 'nothing to merge' aborts consistent...

              r15619
            
        abort: outstanding uncommitted changes

        (use 'hg status' to list changes)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-merge-force

              r12256
            
      Should succeed with --force:

        $ hg -v merge --force

        resolving manifests

        removing a

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

        (branch merge, don't forget to commit)

      Should show 'a' as removed:

        $ hg status

        R a

        $ hg ci -m merge

      Should not show 'a':

        $ hg manifest

        b

	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

Adrian Buehlmann tests: unify test-merge-force	r12256	$ hg init

		$ echo a > a
		$ hg ci -qAm 'add a'

		$ echo b > b
		$ hg ci -qAm 'add b'

		$ hg up -qC 0
		$ hg rm a
		$ hg ci -m 'rm a'
		created new head

		$ hg up -qC 1
		$ rm a

		Local deleted a file, remote removed

		Should fail, since there are deleted files:

		$ hg merge
Kevin Bullock merge: make 'nothing to merge' aborts consistent...	r15619	abort: outstanding uncommitted changes
		(use 'hg status' to list changes)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-merge-force	r12256
		Should succeed with --force:

		$ hg -v merge --force
		resolving manifests
		removing a
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		Should show 'a' as removed:

		$ hg status
		R a

		$ hg ci -m merge

		Should not show 'a':

		$ hg manifest
		b