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

update: show the commit to which we updated in case of multiple heads (BC)...

update: show the commit to which we updated in case of multiple heads (BC) Currently when we have multiple heads on the same branch, update tells us that there some more heads for the current branch but does not tells us the head to which the repository has been updated to. It makes more sense showing the head we updated to and then telling there are some more heads.

Gregory Szorc - - Load All Authors

File last commit:

r26066:89872688 default


                r32698:1b5c61d3

default

Download file

             test-convert-bzr-114.t
        
                    39 lines
            
             | 916 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-114.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
tests: move '#require bzr' into .t files...

              r26066
            
      #require bzr bzr114

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

              r12513
            
        $ . "$TESTDIR/bzr-definitions"

      The file/directory replacement can only be reproduced on

      bzr >= 1.4. Merge it back in test-convert-bzr-directories once

      this version becomes mainstream.

      replace file with dir

        $ mkdir test-replace-file-with-dir

        $ cd test-replace-file-with-dir

        $ bzr init -q source

        $ cd source

        $ echo d > d

        $ bzr add -q d

        $ bzr commit -q -m 'add d file'

        $ rm d

        $ mkdir d

        $ bzr add -q d

        $ bzr commit -q -m 'replace with d dir'

        $ echo a > d/a

        $ bzr add -q d/a

        $ bzr commit -q -m 'add d/a'

        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        2 add d file

        1 replace with d dir

        0 add d/a

        $ manifest source-hg tip

        % manifest of tip

        644   d/a

        $ cd source-hg

        $ hg update

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ 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

Gregory Szorc tests: move '#require bzr' into .t files...	r26066	#require bzr bzr114
Matt Mackall tests: unify test-convert-bzr-114	r12513
		$ . "$TESTDIR/bzr-definitions"

		The file/directory replacement can only be reproduced on
		bzr >= 1.4. Merge it back in test-convert-bzr-directories once
		this version becomes mainstream.
		replace file with dir

		$ mkdir test-replace-file-with-dir
		$ cd test-replace-file-with-dir
		$ bzr init -q source
		$ cd source
		$ echo d > d
		$ bzr add -q d
		$ bzr commit -q -m 'add d file'
		$ rm d
		$ mkdir d
		$ bzr add -q d
		$ bzr commit -q -m 'replace with d dir'
		$ echo a > d/a
		$ bzr add -q d/a
		$ bzr commit -q -m 'add d/a'
		$ cd ..
		$ hg convert source source-hg
		initializing destination source-hg repository
		scanning source...
		sorting...
		converting...
		2 add d file
		1 replace with d dir
		0 add d/a
		$ manifest source-hg tip
		% manifest of tip
		644 d/a
		$ cd source-hg
		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd ../..