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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Gregory Szorc - - Load All Authors

File last commit:

r26066:89872688 default


                r28189:fac3a24b

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