chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Introduce term `anchor'
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index de365a2465e2a115553939f0d5b43f433eaa3c13..565e0b167ad1c104cd026e92c9637eda368c0775 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-55,8
+55,8
@@
t-gdr-good () {
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
-
BreakwaterUpstreamMerge/Upstream)
;;
-
BreakwaterUpstreamMerge/Packaging)
;;
+
Anchor/Upstream)
;;
+
Anchor/Packaging)
;;
*)
fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
;;
*)
fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
;;
@@
-98,7
+98,7
@@
t-gdr-good () {
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
-
BreakwaterUpstreamMerge
)
+
Anchor
)
break
;;
esac
break
;;
esac