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

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22286:3f3b9483

default

Download file

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

        Matt Mackall
    
tests: unify test-convert-bzr-treeroot

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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Matt Mackall tests: unify test-convert-bzr-treeroot	r12517
		$ . "$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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..