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

r21391:cb158354 default


                r22285:85bded43

default

Download file

             test-issue672.t
        
                    102 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue672.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/issue672

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      # 0-2-4

      #  \ \ \

      #   1-3-5

      #

      # rename in #1, content change in #4.

        $ hg init

        $ touch 1

        $ touch 2

        $ hg commit -Am init  # 0

        adding 1

        adding 2

        $ hg rename 1 1a

        $ hg commit -m rename # 1

        $ hg co -C 0

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

        $ echo unrelated >> 2

        $ hg ci -m unrelated1 # 2

        created new head

        $ hg merge --debug 1

          searching for copies back to rev 1

          unmatched files in other:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' 

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         1: other deleted -> r

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        removing 1

        FUJIWARA Katsunori
    
merge: increase safety of parallel updating/removing on icasefs...

              r19095
            
        updating: 1 1/2 files (50.00%)

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         1a: remote created -> g

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        getting 1a

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        updating: 1a 2/2 files (100.00%)

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         2: keep -> k

        Adrian Buehlmann
    
tests: unify test-issue*

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

        (branch merge, don't forget to commit)

        $ hg ci -m merge1 # 3

        $ hg co -C 2

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

        $ echo hello >> 1

        $ hg ci -m unrelated2 # 4

        created new head

        $ hg co -C 3

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

        $ hg merge -y --debug 4

          searching for copies back to rev 1

          unmatched files in local:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' *

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         preserving 1a for resolve of 1a

        Mads Kiilerich
    
merge: keep destination filename as key in filemerge actions...

              r20945
            
         1a: local copied/moved from 1 -> m

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        updating: 1a 1/1 files (100.00%)

        picked tool 'internal:merge' for 1a (binary False symlink False)

        merging 1a and 1 to 1a

        my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d

         premerge successful

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

        (branch merge, don't forget to commit)

        $ hg co -C 4

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

        $ hg merge -y --debug 3

          searching for copies back to rev 1

          unmatched files in other:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' *

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         preserving 1 for resolve of 1a

        removing 1

        Mads Kiilerich
    
merge: keep destination filename as key in filemerge actions...

              r20945
            
         1a: remote moved from 1 -> m

        updating: 1a 1/1 files (100.00%)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        picked tool 'internal:merge' for 1a (binary False symlink False)

        merging 1 and 1a to 1a

        my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d

         premerge successful

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

        (branch merge, don't forget to commit)

	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/issue672
Adrian Buehlmann tests: unify test-issue*	r12195
		# 0-2-4
		# \ \ \
		# 1-3-5
		#
		# rename in #1, content change in #4.

		$ hg init

		$ touch 1
		$ touch 2
		$ hg commit -Am init # 0
		adding 1
		adding 2

		$ hg rename 1 1a
		$ hg commit -m rename # 1

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

		$ echo unrelated >> 2
		$ hg ci -m unrelated1 # 2
		created new head

		$ hg merge --debug 1
		searching for copies back to rev 1
		unmatched files in other:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a'
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
Adrian Buehlmann tests: unify test-issue*	r12195	1: other deleted -> r
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	removing 1
FUJIWARA Katsunori merge: increase safety of parallel updating/removing on icasefs...	r19095	updating: 1 1/2 files (50.00%)
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	1a: remote created -> g
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	getting 1a
Adrian Buehlmann tests: unify test-issue*	r12195	updating: 1a 2/2 files (100.00%)
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	2: keep -> k
Adrian Buehlmann tests: unify test-issue*	r12195	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg ci -m merge1 # 3

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

		$ echo hello >> 1
		$ hg ci -m unrelated2 # 4
		created new head

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

		$ hg merge -y --debug 4
		searching for copies back to rev 1
		unmatched files in local:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a' *
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	preserving 1a for resolve of 1a
Mads Kiilerich merge: keep destination filename as key in filemerge actions...	r20945	1a: local copied/moved from 1 -> m
Adrian Buehlmann tests: unify test-issue*	r12195	updating: 1a 1/1 files (100.00%)
		picked tool 'internal:merge' for 1a (binary False symlink False)
		merging 1a and 1 to 1a
		my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
		premerge successful
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

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

		$ hg merge -y --debug 3
		searching for copies back to rev 1
		unmatched files in other:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a' *
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	preserving 1 for resolve of 1a
		removing 1
Mads Kiilerich merge: keep destination filename as key in filemerge actions...	r20945	1a: remote moved from 1 -> m
		updating: 1a 1/1 files (100.00%)
Adrian Buehlmann tests: unify test-issue*	r12195	picked tool 'internal:merge' for 1a (binary False symlink False)
		merging 1 and 1a to 1a
		my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
		premerge successful
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)