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

r28064:9e0535da default


                r32255:7e35d31b

default

Download file

             test-issue1502.t
        
                    41 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1502.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/1502

      Initialize repository

        $ hg init foo

        $ touch foo/a && hg -R foo commit -A -m "added a"

        adding a

        $ hg clone foo foo1

        updating to branch default

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

        $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"

        $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"

        $ hg -R foo1 pull

        pulling from $TESTTMP/foo (glob)

        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 -R foo1 book branchy

        $ hg -R foo1 book

         * branchy                   1:e3e522925eff

      Pull. Bookmark should not jump to new head.

        $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"

        $ hg -R foo1 pull

        pulling from $TESTTMP/foo (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg -R foo1 book

         * branchy                   1:e3e522925eff

	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

				https://bz.mercurial-scm.org/1502

				Initialize repository

				$ hg init foo
				$ touch foo/a && hg -R foo commit -A -m "added a"
				adding a

				$ hg clone foo foo1
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
				$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
				$ hg -R foo1 pull
				pulling from $TESTTMP/foo (glob)
				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 -R foo1 book branchy
				$ hg -R foo1 book
				* branchy 1:e3e522925eff

				Pull. Bookmark should not jump to new head.

				$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
				$ hg -R foo1 pull
				pulling from $TESTTMP/foo (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				$ hg -R foo1 book
				* branchy 1:e3e522925eff