chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TOPGIT] implement linearize export method
[topgit.git]
/
tg-update.sh
diff --git
a/tg-update.sh
b/tg-update.sh
index 39769bead098c674ff8a8a12f7dfb48254191a7b..288ec14f849495734fec17b839abf678f366ad78 100644
(file)
--- a/
tg-update.sh
+++ b/
tg-update.sh
@@
-75,7
+75,7
@@
if [ -s "$depcheck" ]; then
info "Updating base with $dep changes..."
if ! git merge "$dep"; then
if [ -z "$TG_RECURSIVE" ]; then
info "Updating base with $dep changes..."
if ! git merge "$dep"; then
if [ -z "$TG_RECURSIVE" ]; then
- resume=
'`$tg update` again'
+ resume=
"\`git checkout $name && $tg update\` again"
else # subshell
resume='exit'
fi
else # subshell
resume='exit'
fi
@@
-87,14
+87,16
@@
if [ -s "$depcheck" ]; then
exit 2
fi
done
exit 2
fi
done
-
- # Home, sweet home...
- git checkout -q "$name"
else
info "The base is up-to-date."
fi
rm "$depcheck"
else
info "The base is up-to-date."
fi
rm "$depcheck"
+# Home, sweet home...
+# (We want to always switch back, in case we were on the base from failed
+# previous merge.)
+git checkout -q "$name"
+
merge_with="refs/top-bases/$name"
merge_with="refs/top-bases/$name"
@@
-140,3
+142,5
@@
if ! git merge "$merge_with"; then
fi
exit 3
fi
fi
exit 3
fi
+
+# vim:noet