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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Pierre-Yves David - - Load All Authors

File last commit:

r25125:bd625cd4 default


                r32255:7e35d31b

default

Download file

             test-issue1802.t
        
                    72 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1802.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

      Create extension that can disable exec checks:

        $ cat > noexec.py <<EOF

        > from mercurial import extensions, util

        > def setflags(orig, f, l, x):

        >     pass

        > def checkexec(orig, path):

        >     return False

        > def extsetup(ui):

        >     extensions.wrapfunction(util, 'setflags', setflags)

        >     extensions.wrapfunction(util, 'checkexec', checkexec)

        > EOF

        $ hg init unix-repo

        $ cd unix-repo

        $ touch a

        $ hg add a

        $ hg commit -m 'unix: add a'

        $ hg clone . ../win-repo

        updating to branch default

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

        $ chmod +x a

        $ hg commit -m 'unix: chmod a'

        $ hg manifest -v

        755 * a

        $ cd ../win-repo

        $ touch b

        $ hg add b

        $ hg commit -m 'win: add b'

        $ hg manifest -v

        644   a

        644   b

        $ hg pull

        pulling from $TESTTMP/unix-repo

        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 manifest -v -r tip

        755 * a

      Simulate a Windows merge:

        $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug

          searching for copies back to rev 1

          unmatched files in local:

           b

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39

         a: update permissions -> e

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

        (branch merge, don't forget to commit)

      Simulate a Windows commit:

        $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

        $ hg manifest -v

        755 * a

        644   b

        $ 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

				#require execbit

				Create extension that can disable exec checks:

				$ cat > noexec.py <<EOF
				> from mercurial import extensions, util
				> def setflags(orig, f, l, x):
				> pass
				> def checkexec(orig, path):
				> return False
				> def extsetup(ui):
				> extensions.wrapfunction(util, 'setflags', setflags)
				> extensions.wrapfunction(util, 'checkexec', checkexec)
				> EOF

				$ hg init unix-repo
				$ cd unix-repo
				$ touch a
				$ hg add a
				$ hg commit -m 'unix: add a'
				$ hg clone . ../win-repo
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ chmod +x a
				$ hg commit -m 'unix: chmod a'
				$ hg manifest -v
				755 * a

				$ cd ../win-repo

				$ touch b
				$ hg add b
				$ hg commit -m 'win: add b'

				$ hg manifest -v
				644 a
				644 b

				$ hg pull
				pulling from $TESTTMP/unix-repo
				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 manifest -v -r tip
				755 * a

				Simulate a Windows merge:

				$ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
				searching for copies back to rev 1
				unmatched files in local:
				b
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
				a: update permissions -> e
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Simulate a Windows commit:

				$ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

				$ hg manifest -v
				755 * a
				644 b

				$ cd ..