chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index 71be2807b47ce5f655e7f42159068adba6450859..5a3f2432cf21670c4377838251c9bb6e68bd807b 100755
(executable)
--- a/
tests/tests/gdr-merge-conflicts
+++ b/
tests/tests/gdr-merge-conflicts
@@
-3,12
+3,13
@@
set -e
autoimport=
. tests/lib
autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies NO-DGIT GDR
quilt
t-tstunt-parsechangelog
t-tstunt-parsechangelog
+t-tstunt debchange
t-setup-import gdr-convert-gbp-noarchive
t-setup-import gdr-convert-gbp-noarchive
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
wreckage-before () {
junkref=refs/debrebase/wreckage/junk
wreckage-before () {
junkref=refs/debrebase/wreckage/junk
@@
-58,7
+59,7
@@
git branch master-before-merge
: ----- make the merge -----
: ----- make the merge -----
-git merge -s ours other
+git merge -
-no-edit -
s ours other
# we have to do a little dance to make this not a pseudomerge
t-git-next-date
# we have to do a little dance to make this not a pseudomerge
t-git-next-date