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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Pierre-Yves David - - Load All Authors

File last commit:

r25125:bd625cd4 default


                r25878:800e090e

stable

Download file

             test-merge7.t
        
                    147 lines
            
             | 3.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge7.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      initial

        $ hg init test-a

        $ cd test-a

        $ cat >test.txt <<"EOF"

        > 1

        > 2

        > 3

        > EOF

        $ hg add test.txt

        $ hg commit -m "Initial"

      clone

        $ cd ..

        $ hg clone test-a test-b

        updating to branch default

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

      change test-a

        $ cd test-a

        $ cat >test.txt <<"EOF"

        > one

        > two

        > three

        > EOF

        $ hg commit -m "Numbers as words"

      change test-b

        $ cd ../test-b

        $ cat >test.txt <<"EOF"

        > 1

        > 2.5

        > 3

        > EOF

        $ hg commit -m "2 -> 2.5"

      now pull and merge from test-a

        $ hg pull ../test-a

        pulling from ../test-a

        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

        merging test.txt

        warning: conflicts during merge.

        merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      resolve conflict

        $ cat >test.txt <<"EOF"

        > one

        > two-point-five

        > three

        > EOF

        $ rm -f *.orig

        $ hg resolve -m test.txt

        (no more unresolved files)

        $ hg commit -m "Merge 1"

      change test-a again

        $ cd ../test-a

        $ cat >test.txt <<"EOF"

        > one

        > two-point-one

        > three

        > EOF

        $ hg commit -m "two -> two-point-one"

      pull and merge from test-a again

        $ cd ../test-b

        $ hg pull ../test-a

        pulling from ../test-a

        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 --debug

          searching for copies back to rev 1

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8

         preserving test.txt for resolve of test.txt

         test.txt: versions differ -> m

        picked tool 'internal:merge' for test.txt (binary False symlink False)

        merging test.txt

        my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118

        warning: conflicts during merge.

        merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ cat test.txt

        one

        <<<<<<< local: 50c3a7e29886  - test: Merge 1

        two-point-five

        =======

        two-point-one

        >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one

        three

        $ hg debugindex test.txt

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

             0         0       7  .....       0 01365c4cca56 000000000000 000000000000 (re)

             1         7       9  .....       1 7b013192566a 01365c4cca56 000000000000 (re)

             2        16      15  .....       2 8fe46a3eb557 01365c4cca56 000000000000 (re)

             3        31      2.  .....       3 fc3148072371 7b013192566a 8fe46a3eb557 (re)

             4        5.      25  .....       4 d40249267ae3 8fe46a3eb557 000000000000 (re)

        $ hg log

        changeset:   4:40d11a4173a8

        tag:         tip

        parent:      2:96b70246a118

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     two -> two-point-one

        changeset:   3:50c3a7e29886

        parent:      1:d1e159716d41

        parent:      2:96b70246a118

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Merge 1

        changeset:   2:96b70246a118

        parent:      0:b1832b9d912a

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Numbers as words

        changeset:   1:d1e159716d41

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     2 -> 2.5

        changeset:   0:b1832b9d912a

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Initial

        $ 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

				initial
				$ hg init test-a
				$ cd test-a
				$ cat >test.txt <<"EOF"
				> 1
				> 2
				> 3
				> EOF
				$ hg add test.txt
				$ hg commit -m "Initial"

				clone
				$ cd ..
				$ hg clone test-a test-b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				change test-a
				$ cd test-a
				$ cat >test.txt <<"EOF"
				> one
				> two
				> three
				> EOF
				$ hg commit -m "Numbers as words"

				change test-b
				$ cd ../test-b
				$ cat >test.txt <<"EOF"
				> 1
				> 2.5
				> 3
				> EOF
				$ hg commit -m "2 -> 2.5"

				now pull and merge from test-a
				$ hg pull ../test-a
				pulling from ../test-a
				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
				merging test.txt
				warning: conflicts during merge.
				merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]
				resolve conflict
				$ cat >test.txt <<"EOF"
				> one
				> two-point-five
				> three
				> EOF
				$ rm -f *.orig
				$ hg resolve -m test.txt
				(no more unresolved files)
				$ hg commit -m "Merge 1"

				change test-a again
				$ cd ../test-a
				$ cat >test.txt <<"EOF"
				> one
				> two-point-one
				> three
				> EOF
				$ hg commit -m "two -> two-point-one"

				pull and merge from test-a again
				$ cd ../test-b
				$ hg pull ../test-a
				pulling from ../test-a
				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 --debug
				searching for copies back to rev 1
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
				preserving test.txt for resolve of test.txt
				test.txt: versions differ -> m
				picked tool 'internal:merge' for test.txt (binary False symlink False)
				merging test.txt
				my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
				warning: conflicts during merge.
				merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ cat test.txt
				one
				<<<<<<< local: 50c3a7e29886 - test: Merge 1
				two-point-five
				=======
				two-point-one
				>>>>>>> other: 40d11a4173a8 - test: two -> two-point-one
				three

				$ hg debugindex test.txt
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re)
				1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re)
				2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re)
				3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
				4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re)

				$ hg log
				changeset: 4:40d11a4173a8
				tag: tip
				parent: 2:96b70246a118
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: two -> two-point-one

				changeset: 3:50c3a7e29886
				parent: 1:d1e159716d41
				parent: 2:96b70246a118
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Merge 1

				changeset: 2:96b70246a118
				parent: 0:b1832b9d912a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Numbers as words

				changeset: 1:d1e159716d41
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: 2 -> 2.5

				changeset: 0:b1832b9d912a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial


				$ cd ..