wip

[topbloke.git] / topbloke-merge-driver

diff --git a/topbloke-merge-driver b/topbloke-merge-driver
index c90680e742742d441f40197967639bdc591e6913..72c749d5b389dcbf8fa95817880ff67a13992ace 100755 (executable)
--- a/topbloke-merge-driver
+++ b/topbloke-merge-driver
@@ -4,8 +4,9 @@ set -e
 fail () { echo >&2 "$0: $*"; exit 127; }
 
 case "$1" in
 fail () { echo >&2 "$0: $*"; exit 127; }
 
 case "$1" in

---v1) on=tip ;;
---base-v1) on=base ;;
+--v1) how=tip ;;
+--v1-base) how=base ;;
+--v1-dep) how=dep ;;

 *) fail "bad usage" ;;
 esac
 
 *) fail "bad usage" ;;
 esac
 


@@ -16,21 +17,24 @@ other=$4
 markersize=$5
 
 case $on.$whichfile in
 markersize=$5
 
 case $on.$whichfile in

-tip.msg)
-       exec git-merge-file --marker-size=$markersize \
-               "$current" "$ancestor" "$other"
+dep.msg|dep.deps|dep.flags)
+       touch "$current"
+       exit 0

        ;;
 base.msg|base.deps)
        echo '# not applicable' >"$current"
        exit 0
        ;;
        ;;
 base.msg|base.deps)
        echo '# not applicable' >"$current"
        exit 0
        ;;

-*.included|tip.deps|tip.flags)
-       exec topbloke-merge-lists "$current" "$ancestor" "$other"
-       ;;

 base.flags)
 base.flags)

-       exec topbloke-merge-lists -UDeleted \
+       exec topbloke-merge-lists -UDeleted "$current" "$ancestor" "$other"
+       ;;
+tip.msg)
+       exec git-merge-file --marker-size=$markersize \

                "$current" "$ancestor" "$other"
        ;;
                "$current" "$ancestor" "$other"
        ;;

+tip.deps|tip.flags|*.included|*.pflags)
+       exec topbloke-merge-lists "$current" "$ancestor" "$other"
+       ;;

 *)
        fail "huh $on $whichfile ?"
        ;;
 *)
        fail "huh $on $whichfile ?"
        ;;