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

Gregory Szorc - - Load All Authors

File last commit:

r26066:89872688 default


                r32255:7e35d31b

default

Download file

             test-convert-bzr-treeroot.t
        
                    36 lines
            
             | 787 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-treeroot.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require bzr

        $ . "$TESTDIR/bzr-definitions"

        $ cat > treeset.py <<EOF

        > import sys

        > from bzrlib import workingtree

        > wt = workingtree.WorkingTree.open('.')

        > 

        > message, rootid = sys.argv[1:]

        > wt.set_root_id('tree_root-%s' % rootid)

        > wt.commit(message)

        > EOF

      change the id of the tree root

        $ mkdir test-change-treeroot-id

        $ cd test-change-treeroot-id

        $ bzr init -q source

        $ cd source

        $ echo content > file

        $ bzr add -q file

        $ bzr commit -q -m 'Initial add'

        $ python ../../treeset.py 'Changed root' new

        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        1 Initial add

        0 Changed root

        $ manifest source-hg tip

        % manifest of tip

        644   file

        $ 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 bzr

				$ . "$TESTDIR/bzr-definitions"
				$ cat > treeset.py <<EOF
				> import sys
				> from bzrlib import workingtree
				> wt = workingtree.WorkingTree.open('.')
				>
				> message, rootid = sys.argv[1:]
				> wt.set_root_id('tree_root-%s' % rootid)
				> wt.commit(message)
				> EOF

				change the id of the tree root

				$ mkdir test-change-treeroot-id
				$ cd test-change-treeroot-id
				$ bzr init -q source
				$ cd source
				$ echo content > file
				$ bzr add -q file
				$ bzr commit -q -m 'Initial add'
				$ python ../../treeset.py 'Changed root' new
				$ cd ..
				$ hg convert source source-hg
				initializing destination source-hg repository
				scanning source...
				sorting...
				converting...
				1 Initial add
				0 Changed root
				$ manifest source-hg tip
				% manifest of tip
				644 file

				$ cd ..