Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=d1d180dcdb21fe77b2147485ab55119ced586bb6
commit d1d180dcdb21fe77b2147485ab55119ced586bb6 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sat Nov 3 15:30:35 2007 +0100 repoman: don't mention dg stash, dg pull will do it automatically diff --git a/repoman b/repoman index 73aa687..4a7887d 100755 --- a/repoman +++ b/repoman @@ -145,7 +145,7 @@ fpmmerge() die "rsync failed! :/" fi # now push - dg pull -a || die 'dg pull failed: try dg stash; dg pull; dg stash apply; dg stash clear' + dg pull -a || die 'dg pull failed' git diff|grep -q -- 'diff --cc' && die 'detected conflicts' dg push -a # finally run repoman cl for each @@ -401,7 +401,7 @@ sync() opts="" fi if [ "$F_makepkg_scm" = "git" ]; then - cmd="dg pull $opts || die 'dg pull failed: try dg stash; dg pull; dg stash apply; dg stash clear'; git diff|grep -q -- 'diff --cc' && die 'detected conflicts'; dg push $opts" + cmd="dg pull $opts || (git diff|grep -q -- 'diff --cc' && echo 'detected conflicts'; die 'dg pull failed'); dg push $opts" else cmd="darcs push --match 'name $modpkgname' $opts" fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
