upstream/mercurial-mirror Files · tests/test-issue612.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:

r16094:0776a6ca default


                r22285:85bded43

default

Download file

             test-issue612.t
        
                    34 lines
            
             | 633 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue612.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue612

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

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

              r15447
            
        moving src/a.c to source/a.c (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Ammove

        $ hg co -C 0

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

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

        Matt Mackall
    
merge: don't use unknown()...

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

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        Matt Mackall
    
merge: don't use unknown()...

              r16094
            
        ? src/a.o

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195

	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

Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue612
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir src
		$ echo a > src/a.c
		$ hg ci -Ama
		adding src/a.c

		$ hg mv src source
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	moving src/a.c to source/a.c (glob)
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg ci -Ammove

		$ hg co -C 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo new > src/a.c
		$ echo compiled > src/a.o
		$ hg ci -mupdate
		created new head

		$ hg status
		? src/a.o

		$ hg merge
		merging src/a.c and source/a.c to source/a.c
Matt Mackall merge: don't use unknown()...	r16094	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann tests: unify test-issue*	r12195	(branch merge, don't forget to commit)

		$ hg status
		M source/a.c
		R src/a.c
Matt Mackall merge: don't use unknown()...	r16094	? src/a.o
Adrian Buehlmann tests: unify test-issue*	r12195