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

largefiles: for update -C, only update largefiles when necessary...

largefiles: for update -C, only update largefiles when necessary Before, a --clean update with largefiles would use the "optimization" that it didn't read hashes from standin files before and after the update. Instead of trusting the content of the standin files, it would rehash all the actual largefiles that lfdirstate reported clean and update the standins that didn't have the expected content. It could thus in some "impossible" situations automatically recover from some "largefile got out sync with its standin" issues (even there apparently still were weird corner cases where it could fail). This extra checking is similar to what core --clean intentionally do not do, and it made update --clean unbearable slow. Usually in core Mercurial, --clean will rely on the dirstate to find the files it should update. (It is thus intentionally possible (when trying to trick the system or if there should be bugs) to end up in situations where --clean not will restore the working directory content correctly.) Checking every file when we "know" it is ok is however not an option - that would be too slow. Instead, trust the content of the standin files. Use the same logic for --clean as for linear updates and trust the dirstate and that our "logic" will keep them in sync. It is much cheaper to just rehash the largefiles reported dirty by a status walk and read all standins than to hash largefiles. Most of the changes are just a change of indentation now when the different kinds of updates no longer are handled that differently. Standins for added files are however only written when doing a normal update, while deleted and removed files only will be updated for --clean updates.

Mads Kiilerich - - Load All Authors

File last commit:

r21391:cb158354 default


                r24787:9d5c2789

default

Download file

             test-merge-commit.t
        
                    184 lines
            
             | 5.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-commit.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Check that renames are correctly saved by a commit after a merge

      Test with the merge on 3 having the rename on the local parent

        $ hg init a

        $ cd a

        $ echo line1 > foo

        $ hg add foo

        $ hg ci -m '0: add foo'

        $ echo line2 >> foo

        $ hg ci -m '1: change foo'

        $ hg up -C 0

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

        $ hg mv foo bar

        $ rm bar

        $ echo line0 > bar

        $ echo line1 >> bar

        $ hg ci -m '2: mv foo bar; change bar'

        created new head

        $ hg merge 1

        merging bar and foo to bar

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

        (branch merge, don't forget to commit)

        $ cat bar

        line0

        line1

        line2

        $ hg ci -m '3: merge with local rename'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

        $ hg debugrename bar

        bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       7  .....       0 690b295714ae 000000000000 000000000000 (re)

             1         7      13  .....       1 9e25c27b8757 690b295714ae 000000000000 (re)

      Revert the content change from rev 2:

        $ hg up -C 2

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

        $ rm bar

        $ echo line1 > bar

        $ hg ci -m '4: revert content change from rev 2'

        created new head

        $ hg log --template '{rev}:{node|short} {parents}\n'

        4:2263c1be0967 2:0f2ff26688b9 

        3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 

        2:0f2ff26688b9 0:2665aaee66e9 

        1:5cd961e4045d 

        0:2665aaee66e9 

      This should use bar@rev2 as the ancestor:

        $ hg --debug merge 3

          searching for copies back to rev 1

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28

         preserving bar for resolve of bar

         bar: versions differ -> m

        updating: bar 1/1 files (100.00%)

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

        merging bar

        my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9

         premerge successful

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

        (branch merge, don't forget to commit)

        $ cat bar

        line1

        line2

        $ hg ci -m '5: merge'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

             2       153       7  .....       4 ff4b45017382 d35118874825 000000000000 (re)

             3       160      13  .....       5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

      Same thing, but with the merge on 3 having the rename

      on the remote parent:

        $ cd ..

        $ hg clone -U -r 1 -r 2 a b

        adding changesets

        adding manifests

        adding file changes

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

        $ cd b

        $ hg up -C 1

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

        $ hg merge 2

        merging foo and bar to bar

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

        (branch merge, don't forget to commit)

        $ cat bar

        line0

        line1

        line2

        $ hg ci -m '3: merge with remote rename'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

        $ hg debugrename bar

        bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       7  .....       0 690b295714ae 000000000000 000000000000 (re)

             1         7      13  .....       1 9e25c27b8757 690b295714ae 000000000000 (re)

      Revert the content change from rev 2:

        $ hg up -C 2

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

        $ rm bar

        $ echo line1 > bar

        $ hg ci -m '4: revert content change from rev 2'

        created new head

        $ hg log --template '{rev}:{node|short} {parents}\n'

        4:2263c1be0967 2:0f2ff26688b9 

        3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 

        2:0f2ff26688b9 0:2665aaee66e9 

        1:5cd961e4045d 

        0:2665aaee66e9 

      This should use bar@rev2 as the ancestor:

        $ hg --debug merge 3

          searching for copies back to rev 1

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0

         preserving bar for resolve of bar

         bar: versions differ -> m

        updating: bar 1/1 files (100.00%)

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

        merging bar

        my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9

         premerge successful

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

        (branch merge, don't forget to commit)

        $ cat bar

        line1

        line2

        $ hg ci -m '5: merge'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

             2       153       7  .....       4 ff4b45017382 d35118874825 000000000000 (re)

             3       160      13  .....       5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

        $ 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

				Check that renames are correctly saved by a commit after a merge

				Test with the merge on 3 having the rename on the local parent

				$ hg init a
				$ cd a

				$ echo line1 > foo
				$ hg add foo
				$ hg ci -m '0: add foo'

				$ echo line2 >> foo
				$ hg ci -m '1: change foo'

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

				$ hg mv foo bar
				$ rm bar
				$ echo line0 > bar
				$ echo line1 >> bar
				$ hg ci -m '2: mv foo bar; change bar'
				created new head

				$ hg merge 1
				merging bar and foo to bar
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line0
				line1
				line2

				$ hg ci -m '3: merge with local rename'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)

				$ hg debugrename bar
				bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
				1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)


				Revert the content change from rev 2:

				$ hg up -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm bar
				$ echo line1 > bar
				$ hg ci -m '4: revert content change from rev 2'
				created new head

				$ hg log --template '{rev}:{node\|short} {parents}\n'
				4:2263c1be0967 2:0f2ff26688b9
				3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d
				2:0f2ff26688b9 0:2665aaee66e9
				1:5cd961e4045d
				0:2665aaee66e9

				This should use bar@rev2 as the ancestor:

				$ hg --debug merge 3
				searching for copies back to rev 1
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
				preserving bar for resolve of bar
				bar: versions differ -> m
				updating: bar 1/1 files (100.00%)
				picked tool 'internal:merge' for bar (binary False symlink False)
				merging bar
				my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line1
				line2

				$ hg ci -m '5: merge'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
				2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
				3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)


				Same thing, but with the merge on 3 having the rename
				on the remote parent:

				$ cd ..
				$ hg clone -U -r 1 -r 2 a b
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 2 files (+1 heads)
				$ cd b

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

				$ hg merge 2
				merging foo and bar to bar
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line0
				line1
				line2

				$ hg ci -m '3: merge with remote rename'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)

				$ hg debugrename bar
				bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
				1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)


				Revert the content change from rev 2:

				$ hg up -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm bar
				$ echo line1 > bar
				$ hg ci -m '4: revert content change from rev 2'
				created new head

				$ hg log --template '{rev}:{node\|short} {parents}\n'
				4:2263c1be0967 2:0f2ff26688b9
				3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9
				2:0f2ff26688b9 0:2665aaee66e9
				1:5cd961e4045d
				0:2665aaee66e9

				This should use bar@rev2 as the ancestor:

				$ hg --debug merge 3
				searching for copies back to rev 1
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
				preserving bar for resolve of bar
				bar: versions differ -> m
				updating: bar 1/1 files (100.00%)
				picked tool 'internal:merge' for bar (binary False symlink False)
				merging bar
				my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line1
				line2

				$ hg ci -m '5: merge'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
				2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
				3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

				$ cd ..