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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Mads Kiilerich - - Load All Authors

File last commit:

r21391:cb158354 default


                r24995:0579b0c2

default

Download file

             test-double-merge.t
        
                    67 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-double-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo line 1 > foo

        $ hg ci -qAm 'add foo'

      copy foo to bar and change both files

        $ hg cp foo bar

        $ echo line 2-1 >> foo

        $ echo line 2-2 >> bar

        $ hg ci -m 'cp foo bar; change both'

      in another branch, change foo in a way that doesn't conflict with

      the other changes

        $ hg up -qC 0

        $ echo line 0 > foo

        $ hg cat foo >> foo

        $ hg ci -m 'change foo'

        created new head

      we get conflicts that shouldn't be there

        $ hg merge -P

        changeset:   1:484bf6903104

        user:        test

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

        summary:     cp foo bar; change both

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           bar

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

           src: 'foo' -> dst: 'bar' *

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

         preserving foo for resolve of bar

         preserving foo for resolve of foo

         bar: remote copied from foo -> m

        updating: bar 1/2 files (50.00%)

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

        merging foo and bar to bar

        my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

         foo: versions differ -> m

        updating: foo 2/2 files (100.00%)

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

        merging foo

        my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

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

        (branch merge, don't forget to commit)

      contents of foo

        $ cat foo

        line 0

        line 1

        line 2-1

      contents of bar

        $ cat bar

        line 0

        line 1

        line 2-2

        $ 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

				$ hg init repo
				$ cd repo

				$ echo line 1 > foo
				$ hg ci -qAm 'add foo'

				copy foo to bar and change both files
				$ hg cp foo bar
				$ echo line 2-1 >> foo
				$ echo line 2-2 >> bar
				$ hg ci -m 'cp foo bar; change both'

				in another branch, change foo in a way that doesn't conflict with
				the other changes
				$ hg up -qC 0
				$ echo line 0 > foo
				$ hg cat foo >> foo
				$ hg ci -m 'change foo'
				created new head

				we get conflicts that shouldn't be there
				$ hg merge -P
				changeset: 1:484bf6903104
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: cp foo bar; change both

				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in other:
				bar
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'foo' -> dst: 'bar' *
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
				preserving foo for resolve of bar
				preserving foo for resolve of foo
				bar: remote copied from foo -> m
				updating: bar 1/2 files (50.00%)
				picked tool 'internal:merge' for bar (binary False symlink False)
				merging foo and bar to bar
				my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				foo: versions differ -> m
				updating: foo 2/2 files (100.00%)
				picked tool 'internal:merge' for foo (binary False symlink False)
				merging foo
				my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				0 files updated, 2 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				contents of foo
				$ cat foo
				line 0
				line 1
				line 2-1

				contents of bar
				$ cat bar
				line 0
				line 1
				line 2-2

				$ cd ..