upstream/mercurial-mirror Files · tests/test-revlog-group-emptyiter.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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32255:7e35d31b

default

Download file

             test-revlog-group-emptyiter.t
        
                    35 lines
            
             | 685 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-group-emptyiter.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue1678: IndexError when pushing

      setting up base repo

        $ hg init a

        $ cd a

        $ touch a

        $ hg ci -Am a

        adding a

        $ cd ..

      cloning base repo

        $ hg clone a b

        updating to branch default

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

        $ cd b

      setting up cset to push

        $ hg up null

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

        $ touch a

      different msg so we get a clog new entry

        $ hg ci -Am b

        adding a

        created new head

      pushing

        $ hg push -f ../a

        pushing to ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        $ 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

				Issue1678: IndexError when pushing

				setting up base repo
				$ hg init a
				$ cd a
				$ touch a
				$ hg ci -Am a
				adding a
				$ cd ..

				cloning base repo
				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd b

				setting up cset to push
				$ hg up null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ touch a
				different msg so we get a clog new entry
				$ hg ci -Am b
				adding a
				created new head

				pushing
				$ hg push -f ../a
				pushing to ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)

				$ cd ..