wip new metadata

[topbloke.git] / topbloke-merge-driver

diff --git a/topbloke-merge-driver b/topbloke-merge-driver
index 891bfa4ca919c873240369881cff53e1e316473a..1c0017f2d42ddb1dbce74dc7e09a887a0c55c792 100755 (executable)
--- a/topbloke-merge-driver
+++ b/topbloke-merge-driver
@@ -1,10 +1,13 @@
 #!/bin/sh
 set -e
 
+xxx new theory, new metadata, not yet done here
+
 fail () { echo >&2 "$0: $*"; exit 127; }
 
 case "$1" in
---v1) how=tip ;;               # merge into tip from another tip of this patch
+--v1) how=same ;;              # merge into tip from another tip of this patch
+                               #  or into base from another base of this patch
 --v1-base) how=base ;;         # merge into tip from a base of this patch
 --v1-dep) how=dep ;;           # merge into base from a dep's tip
 *) fail "bad usage" ;;
@@ -31,13 +34,13 @@ base.deps)
 base.props)
        exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
        ;;
-tip.msg)
+same.msg)
        exec git-merge-file --marker-size=$markersize "$@"
        ;;
-tip.deps|*.included)
+same.deps|*.included)
        exec topbloke-merge-lists -M$markersize "$@"
        ;;
-tip.props|*.pprops)
+same.props|*.pprops)
        exec topbloke-merge-lists -M$markersize -P "$@"
        ;;
 *)