From 9092d7656e160bc7384d82c6c42062817ae0a20f Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 9 Sep 2008 20:50:15 +0200 Subject: [PATCH] tg-update.sh: Better explain base update --- tg-update.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tg-update.sh b/tg-update.sh index 50b29b4..5caf691 100644 --- a/tg-update.sh +++ b/tg-update.sh @@ -43,9 +43,9 @@ if [ -s "$depcheck" ]; then dep="$(echo "$depline" | cut -c 2-)" # We do not distinguish between dependencies out-of-date - # and base out-of-date cases for $dep here, but thanks - # to needs_update returning : for the latter, we do - # correctly recurse here in both cases. + # and base out-of-date cases for $dep here, + # but thanks to needs_update returning : for the latter, + # we do correctly recurse here in both cases. if [ x"$action" = x+ ]; then info "Recursing to $dep..." @@ -67,6 +67,12 @@ if [ -s "$depcheck" ]; then switch_to_base "$name" fi + # This will always be a proper topic branch + # (not a base or remote), since for deep updates + # we recurse and immediate dependencies + # are always proper. (branch_needs_update() is called + # only on the _dependencies_, not our branch itself!) + info "Updating base with $dep changes..." if ! git merge "$dep"; then if [ -z "$TG_RECURSIVE" ]; then -- 2.30.2