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

largefiles: factor out procedures to update standins for pre-committing...

largefiles: factor out procedures to update standins for pre-committing This patch factors out procedures to update standins for pre-committing. This is one of preparations to avoid execution of such procedures according to invocation context. For example, resuming automated committing (e.g. "hg rebase --continue") should update standins at the 1st commit, because largefiles in the working directory may be modified manually. But on the other hand, it should avoid updating standins at subsequent committings for efficiency reason. For simplicity, this patch just moves procedures mechanically only with replacing below. - "self" => "repo" - "lfutil." => (none) - "orig" invocation => returning "match" Using "fstandin" instead "standin" as the name of local variable for the loop below is the only special care, because the latter shadows the same name function in "lfutil.py". [before] for standin in standins: lfile = lfutil.splitstandin(standin) if lfdirstate[lfile] != 'r': lfutil.updatestandin(self, standin) [after] for fstandin in standins: lfile = splitstandin(fstandin) if lfdirstate[lfile] != 'r': updatestandin(repo, fstandin)

Siddharth Agarwal - - Load All Authors

File last commit:

r19802:94c39465 default


                r23185:9870173e

default

Download file

             test-merge-force.t
        
                    45 lines
            
             | 670 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

        Siddharth Agarwal
    
merge: standardize error message for dirty working dir

              r19802
            
        abort: uncommitted changes

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

              r15619
            
        (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
Siddharth Agarwal merge: standardize error message for dirty working dir	r19802	abort: uncommitted changes
Kevin Bullock merge: make 'nothing to merge' aborts consistent...	r15619	(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