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

convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)...

convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232) Before this patch, metadata and file names were interpreted like: - unicode objects were converted to UTF-8 - non unicode objects were left unchanged Looking at the code and bzr being known for transcoding filenames, we expect everything to be returned as unicode objects, and we want to encode them in UTF-8, like the subversion source does. To do that, we just remove the custom implementation of .recode().

Matt Mackall - - Load All Authors

File last commit:

r12516:90efbd1a default


                r16059:f5b6046f

default

Download file

             test-convert-bzr-merges.t
        
                    68 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-merges.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r12516
            
      N.B. bzr 1.13 has a bug that breaks this test.  If you see this

      test fail, check your bzr version.  Upgrading to bzr 1.13.1

      should fix it.

        $ . "$TESTDIR/bzr-definitions"

      test multiple merges at once

        $ mkdir test-multimerge

        $ cd test-multimerge

        $ bzr init -q source

        $ cd source

        $ echo content > file

        $ bzr add -q file

        $ bzr commit -q -m 'Initial add'

        $ cd ..

        $ bzr branch -q source source-branch1

        $ cd source-branch1

        $ echo morecontent >> file

        $ echo evenmorecontent > file-branch1

        $ bzr add -q file-branch1

        $ bzr commit -q -m 'Added branch1 file'

        $ cd ../source

        $ sleep 1

        $ echo content > file-parent

        $ bzr add -q file-parent

        $ bzr commit -q -m 'Added parent file'

        $ cd ..

        $ bzr branch -q source source-branch2

        $ cd source-branch2

        $ echo somecontent > file-branch2

        $ bzr add -q file-branch2

        $ bzr commit -q -m 'Added brach2 file'

        $ sleep 1

        $ cd ../source

        $ bzr merge -q ../source-branch1

        $ bzr merge -q --force ../source-branch2

        $ bzr commit -q -m 'Merged branches'

        $ cd ..

        $ hg convert --datesort source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        4 Initial add

        3 Added branch1 file

        2 Added parent file

        1 Added brach2 file

        0 Merged branches

        $ glog -R source-hg

        o    5 "(octopus merge fixup)" files:

        |\

        | o    4 "Merged branches" files: file-branch2

        | |\

        o---+  3 "Added brach2 file" files: file-branch2

         / /

        | o  2 "Added parent file" files: file-parent

        | |

        o |  1 "Added branch1 file" files: file file-branch1

        |/

        o  0 "Initial add" files: file

        $ manifest source-hg tip

        % manifest of tip

        644   file

        644   file-branch1

        644   file-branch2

        644   file-parent

	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-merges	r12516	N.B. bzr 1.13 has a bug that breaks this test. If you see this
		test fail, check your bzr version. Upgrading to bzr 1.13.1
		should fix it.

		$ . "$TESTDIR/bzr-definitions"

		test multiple merges at once

		$ mkdir test-multimerge
		$ cd test-multimerge
		$ bzr init -q source
		$ cd source
		$ echo content > file
		$ bzr add -q file
		$ bzr commit -q -m 'Initial add'
		$ cd ..
		$ bzr branch -q source source-branch1
		$ cd source-branch1
		$ echo morecontent >> file
		$ echo evenmorecontent > file-branch1
		$ bzr add -q file-branch1
		$ bzr commit -q -m 'Added branch1 file'
		$ cd ../source
		$ sleep 1
		$ echo content > file-parent
		$ bzr add -q file-parent
		$ bzr commit -q -m 'Added parent file'
		$ cd ..
		$ bzr branch -q source source-branch2
		$ cd source-branch2
		$ echo somecontent > file-branch2
		$ bzr add -q file-branch2
		$ bzr commit -q -m 'Added brach2 file'
		$ sleep 1
		$ cd ../source
		$ bzr merge -q ../source-branch1
		$ bzr merge -q --force ../source-branch2
		$ bzr commit -q -m 'Merged branches'
		$ cd ..
		$ hg convert --datesort source source-hg
		initializing destination source-hg repository
		scanning source...
		sorting...
		converting...
		4 Initial add
		3 Added branch1 file
		2 Added parent file
		1 Added brach2 file
		0 Merged branches
		$ glog -R source-hg
		o 5 "(octopus merge fixup)" files:
		\|\
		\| o 4 "Merged branches" files: file-branch2
		\| \|\
		o---+ 3 "Added brach2 file" files: file-branch2
		/ /
		\| o 2 "Added parent file" files: file-parent
		\| \|
		o \| 1 "Added branch1 file" files: file file-branch1
		\|/
		o 0 "Initial add" files: file

		$ manifest source-hg tip
		% manifest of tip
		644 file
		644 file-branch1
		644 file-branch2
		644 file-parent