upstream/mercurial-mirror Files · tests/test-convert-bzr-merges.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-merges.t
        
                    70 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-merges.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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

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