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

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Siddharth Agarwal - - Load All Authors

File last commit:

r19802:94c39465 default


                r22286:3f3b9483

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