Mercurial > hg
changeset 12516:90efbd1a2a56
tests: unify test-convert-bzr-merges
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 26 Sep 2010 14:37:30 -0500 |
| parents | b6a784e39ad4 |
| children | cc8f1083e8be |
| files | tests/test-convert-authormap.t tests/test-convert-bzr-114.t tests/test-convert-bzr-directories.t tests/test-convert-bzr-ghosts.t tests/test-convert-bzr-merges tests/test-convert-bzr-merges.out tests/test-convert-bzr-merges.t tests/test-convert-bzr.t tests/test-convert.t |
| diffstat | 3 files changed, 68 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-bzr-merges Sun Sep 26 14:36:49 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh - -# 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" - -echo % 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 -glog -R source-hg -manifest source-hg tip
--- a/tests/test-convert-bzr-merges.out Sun Sep 26 14:36:49 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -% test multiple merges at once -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 -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 of tip -644 file -644 file-branch1 -644 file-branch2 -644 file-parent
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-bzr-merges.t Sun Sep 26 14:37:30 2010 -0500 @@ -0,0 +1,68 @@ +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