upstream/mercurial-mirror Files · tests/test-issue660.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r19510:8b190adb stable


                r22285:85bded43

default

Download file

             test-issue660.t
        
                    154 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue660.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: remove test-issue322 as it's fully included in test-issue660

              r14112
            
      http://mercurial.selenic.com/bts/issue660 and:

      http://mercurial.selenic.com/bts/issue322

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ echo a > a

        $ mkdir b

        $ echo b > b/b

        $ hg commit -A -m "a is file, b is dir"

        adding a

        adding b/b

      File replaced with directory:

        $ rm a

        $ mkdir a

        $ echo a > a/a

      Should fail - would corrupt dirstate:

        $ hg add a/a

        abort: file 'a' in dirstate clashes with 'a/a'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Removing shadow:

        $ hg rm --after a

      Should succeed - shadow removed:

        $ hg add a/a

      Directory replaced with file:

        $ rm -r b

        $ echo b > b

      Should fail - would corrupt dirstate:

        $ hg add b

        abort: directory 'b' already in dirstate

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Removing shadow:

        $ hg rm --after b/b

      Should succeed - shadow removed:

        $ hg add b

      Look what we got:

        $ hg st

        A a/a

        A b

        R a

        R b/b

      Revert reintroducing shadow - should fail:

        $ rm -r a b

        $ hg revert b/b

        abort: file 'b' in dirstate clashes with 'b/b'

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Revert all - should succeed:

        $ hg revert --all

        undeleting a

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        forgetting a/a (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        forgetting b

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        undeleting b/b (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg st

        Matt Mackall
    
revert: make backup when unforgetting a file (issue3423)...

              r19510
            
      Issue3423:

        $ hg forget a

        $ echo zed > a

        $ hg revert a

        $ hg st

        ? a.orig

        $ rm a.orig

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      addremove:

        $ rm -r a b

        $ mkdir a

        $ echo a > a/a

        $ echo b > b

        $ hg addremove -s 0

        removing a

        adding a/a

        adding b

        removing b/b

        $ hg st

        A a/a

        A b

        R a

        R b/b

      commit:

        $ hg ci -A -m "a is dir, b is file"

        $ hg st --all

        C a/a

        C b

      Long directory replaced with file:

        $ mkdir d

        $ mkdir d/d

        $ echo d > d/d/d

        $ hg commit -A -m "d is long directory"

        adding d/d/d

        $ rm -r d

        $ echo d > d

      Should fail - would corrupt dirstate:

        $ hg add d

        abort: directory 'd' already in dirstate

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Removing shadow:

        $ hg rm --after d/d/d

      Should succeed - shadow removed:

        $ hg add d

        $ hg ci -md

      Update should work at least with clean working directory:

        $ rm -r a b d

        $ hg up -r 0

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st --all

        C a

        C b/b

        $ rm -r a b

        $ hg up -r 1

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st --all

        C a/a

        C 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

Nicolas Dumazet tests: remove test-issue322 as it's fully included in test-issue660	r14112	http://mercurial.selenic.com/bts/issue660 and:
		http://mercurial.selenic.com/bts/issue322
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ echo a > a
		$ mkdir b
		$ echo b > b/b
		$ hg commit -A -m "a is file, b is dir"
		adding a
		adding b/b

		File replaced with directory:

		$ rm a
		$ mkdir a
		$ echo a > a/a

		Should fail - would corrupt dirstate:

		$ hg add a/a
		abort: file 'a' in dirstate clashes with 'a/a'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
		Removing shadow:

		$ hg rm --after a

		Should succeed - shadow removed:

		$ hg add a/a

		Directory replaced with file:

		$ rm -r b
		$ echo b > b

		Should fail - would corrupt dirstate:

		$ hg add b
		abort: directory 'b' already in dirstate
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
		Removing shadow:

		$ hg rm --after b/b

		Should succeed - shadow removed:

		$ hg add b

		Look what we got:

		$ hg st
		A a/a
		A b
		R a
		R b/b

		Revert reintroducing shadow - should fail:

		$ rm -r a b
		$ hg revert b/b
		abort: file 'b' in dirstate clashes with 'b/b'
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
		Revert all - should succeed:

		$ hg revert --all
		undeleting a
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	forgetting a/a (glob)
Adrian Buehlmann tests: unify test-issue*	r12195	forgetting b
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	undeleting b/b (glob)
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg st

Matt Mackall revert: make backup when unforgetting a file (issue3423)...	r19510	Issue3423:

		$ hg forget a
		$ echo zed > a
		$ hg revert a
		$ hg st
		? a.orig
		$ rm a.orig

Adrian Buehlmann tests: unify test-issue*	r12195	addremove:

		$ rm -r a b
		$ mkdir a
		$ echo a > a/a
		$ echo b > b

		$ hg addremove -s 0
		removing a
		adding a/a
		adding b
		removing b/b

		$ hg st
		A a/a
		A b
		R a
		R b/b

		commit:

		$ hg ci -A -m "a is dir, b is file"
		$ hg st --all
		C a/a
		C b

		Long directory replaced with file:

		$ mkdir d
		$ mkdir d/d
		$ echo d > d/d/d
		$ hg commit -A -m "d is long directory"
		adding d/d/d

		$ rm -r d
		$ echo d > d

		Should fail - would corrupt dirstate:

		$ hg add d
		abort: directory 'd' already in dirstate
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
		Removing shadow:

		$ hg rm --after d/d/d

		Should succeed - shadow removed:

		$ hg add d
		$ hg ci -md

		Update should work at least with clean working directory:

		$ rm -r a b d
		$ hg up -r 0
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg st --all
		C a
		C b/b

		$ rm -r a b
		$ hg up -r 1
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg st --all
		C a/a
		C b