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

hook: fewer parentheses for hook load errors...

hook: fewer parentheses for hook load errors This matches 'hook failed' warnings. We're also going to add hints to some of the hook load errors. Without this change we'd have two pairs of parens for a single error message, which looks really cluttered.

Gregory Szorc - - Load All Authors

File last commit:

r26066:89872688 default


                r28079:0c9e9140

default

Download file

             test-convert-bzr-merges.t
        
                    72 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-merges.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require bzr

      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@source "(octopus merge fixup)" files:

        |\

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

        | |\

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

         / /

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

        | |

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

        |/

        o  0@source "Initial add" files: file

        $ manifest source-hg tip

        % manifest of tip

        644   file

        644   file-branch1

        644   file-branch2

        644   file-parent

        $ 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

				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@source "(octopus merge fixup)" files:
				\|\
				\| o 4@source "Merged branches" files: file-branch2
				\| \|\
				o---+ 3@source-branch2 "Added brach2 file" files: file-branch2
				/ /
				\| o 2@source "Added parent file" files: file-parent
				\| \|
				o \| 1@source-branch1 "Added branch1 file" files: file file-branch1
				\|/
				o 0@source "Initial add" files: file

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

				$ cd ..