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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-merge6.t
        
                    70 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge6.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cat <<EOF > merge

        > import sys, os

        > print "merging for", os.path.basename(sys.argv[1])

        > EOF

        $ HGMERGE="python ../merge"; export HGMERGE

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init A1

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd A1

        $ echo This is file foo1 > foo

        $ echo This is file bar1 > bar

        $ hg add foo bar

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit text"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd ..

        $ hg clone A1 B1

        updating to branch default

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

        $ cd A1

        $ rm bar

        $ hg remove bar

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd ../B1

        $ echo This is file foo22 > foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd ..

        $ hg clone A1 A2

        updating to branch default

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

        $ hg clone B1 B2

        updating to branch default

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

        $ cd A1

        $ hg pull ../B1

        pulling from ../B1

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

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

        (branch merge, don't forget to commit)

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        $ cd ../B2

        $ hg pull ../A2

        pulling from ../A2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

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

        (branch merge, don't forget to commit)

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Pradeepkumar Gayam tests: unify test-merge6	r11979	$ cat <<EOF > merge
		> import sys, os
		> print "merging for", os.path.basename(sys.argv[1])
		> EOF
		$ HGMERGE="python ../merge"; export HGMERGE

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init A1
Pradeepkumar Gayam tests: unify test-merge6	r11979	$ cd A1
		$ echo This is file foo1 > foo
		$ echo This is file bar1 > bar
		$ hg add foo bar
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit text"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ cd ..
		$ hg clone A1 B1
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ cd A1
		$ rm bar
		$ hg remove bar
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ cd ../B1
		$ echo This is file foo22 > foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ cd ..
		$ hg clone A1 A2
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg clone B1 B2
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ cd A1
		$ hg pull ../B1
		pulling from ../B1
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979	bar should remain deleted.
		$ hg manifest --debug
		f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

		$ cd ../B2
		$ hg pull ../A2
		pulling from ../A2
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 0 changes to 0 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg merge
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979	bar should remain deleted.
		$ hg manifest --debug
		f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..