diff options
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index 1a4f510..5949c80 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime -Tests: gdr-merge gdr-newupstream gdr-viagit +Tests: gdr-merge gdr-merge-conflicts gdr-newupstream gdr-viagit Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts new file mode 100755 index 0000000..afdd014 --- /dev/null +++ b/tests/tests/gdr-merge-conflicts @@ -0,0 +1,43 @@ +#!/bin/bash +set -e +autoimport= +. tests/lib + +t-dependencies NO-DGIT GDR + +t-tstunt-parsechangelog +t-setup-import gdr-convert-gbp-noarchive + +: 'do a simple test' + +cd $p + +t-gdr-prep-new-upstream 2.1 +git tag v2.1 upstream + +t-some-changes before +t-git-debrebase quick + +git checkout -b other +t-some-changes other '' -other + +git checkout other +echo other-upstream-confict >>docs/README +git commit -m 'other-upstream-conflict' docs/README + +t-git-debrebase quick + +git checkout master +t-git-debrebase new-upstream 2.1 + +t-merge-conflicted-stripping-conflict-markers other docs/README + +export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1 + +t-expect-fail F:'docs/README' \ +t-git-debrebase + +# xxx want to test a nomerge from first walk analysis half +# xxx want to check wrecknotes appear + +t-ok |