upstream/mercurial-mirror Files · tests/test-convert-bzr-treeroot.t

graft: fix collision detection with origin revisions that are missing...

graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22302:9472284d

stable

Download file

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

        $ . "$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


				$ . "$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 ..