upstream/mercurial-mirror Files · tests/test-extra-filelog-entry.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.

Bryan O'Sullivan - - Load All Authors

File last commit:

r17132:b87acfda default


                r32255:7e35d31b

default

Download file

             test-extra-filelog-entry.t
        
                    21 lines
            
             | 448 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-extra-filelog-entry.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue351: mq: qrefresh can create extra revlog entry

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ hg qinit

        $ echo b > b

        $ hg ci -A -m foo

        adding b

        $ echo cc > b

        $ hg qnew -f foo.diff

        $ echo b > b

        $ hg qrefresh

        $ hg debugindex b

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

             0         0       3  .....       0 1e88685f5dde 000000000000 000000000000 (re)

	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

				Issue351: mq: qrefresh can create extra revlog entry

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init
				$ hg qinit

				$ echo b > b
				$ hg ci -A -m foo
				adding b

				$ echo cc > b
				$ hg qnew -f foo.diff
				$ echo b > b
				$ hg qrefresh

				$ hg debugindex b
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re)