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

timeless@mozdev.org - - Load All Authors

File last commit:

r17490:a03c3ba3 default


                r32255:7e35d31b

default

Download file

             test-debugindexdot.t
        
                    25 lines
            
             | 435 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-debugindexdot.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Just exercise debugindexdot

      Create a short file history including a merge.

        $ hg init t

        $ cd t

        $ echo a > a

        $ hg ci -qAm t1 -d '0 0'

        $ echo a >> a

        $ hg ci -m t2 -d '1 0'

        $ hg up -qC 0

        $ echo b >> a

        $ hg ci -m t3 -d '2 0'

        created new head

        $ HGMERGE=true hg merge -q

        $ hg ci -m merge -d '3 0'

        $ hg debugindexdot .hg/store/data/a.i

        digraph G {

        	-1 -> 0

        	0 -> 1

        	0 -> 2

        	2 -> 3

        	1 -> 3

        }

        $ 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

				Just exercise debugindexdot
				Create a short file history including a merge.
				$ hg init t
				$ cd t
				$ echo a > a
				$ hg ci -qAm t1 -d '0 0'
				$ echo a >> a
				$ hg ci -m t2 -d '1 0'
				$ hg up -qC 0
				$ echo b >> a
				$ hg ci -m t3 -d '2 0'
				created new head
				$ HGMERGE=true hg merge -q
				$ hg ci -m merge -d '3 0'

				$ hg debugindexdot .hg/store/data/a.i
				digraph G {
				-1 -> 0
				0 -> 1
				0 -> 2
				2 -> 3
				1 -> 3
				}

				$ cd ..