@@ -448,7 +448,8 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
...
@@ -448,7 +448,8 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
altspec_to_local $BPSPEC
altspec_to_local $BPSPEC
docmd git checkout $USEBRANCH|| fatal "Can't checkout branch $USEBRANCH. Use $BPSPEC manually or remove it."
docmd git checkout $USEBRANCH|| fatal "Can't checkout branch $USEBRANCH. Use $BPSPEC manually or remove it."
docmd git merge $CURBRANCH
# TODO: check result message for merge?
docmd git merge --no-ff$CURBRANCH
mv-f$BPSPEC$SPEC
mv-f$BPSPEC$SPEC
# FIXME: Ctrl-\ and q will cancelled less with return error code
# FIXME: Ctrl-\ and q will cancelled less with return error code
if[-z"$QUIET"]&&tty-s&&!(echo"etersoft-build-utils INFO: Please check diff for backported spec:";echo"# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process.";echo; git diff $USEBRANCH) | less;then
if[-z"$QUIET"]&&tty-s&&!(echo"etersoft-build-utils INFO: Please check diff for backported spec:";echo"# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process.";echo; git diff $USEBRANCH) | less;then
