From: Daniel Albers <daniel@lbe.rs>
Date: Sat, 26 Oct 2013 23:28:58 +0000 (+0200)
Subject: tx-sync.sh: try to pull first
X-Git-Tag: 0.10-beta1~80
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=9218000d5e295c125a552fa41c5f139b149f4726

tx-sync.sh: try to pull first
---

diff --git a/scripts/tx-sync.sh b/scripts/tx-sync.sh
index c60d6af0..47b931cc 100755
--- a/scripts/tx-sync.sh
+++ b/scripts/tx-sync.sh
@@ -5,6 +5,7 @@ localpobranch=i18n-tx-sync
 pushd "$quasselsrc" && ( 
   currb=$(git name-rev --name-only HEAD)
   git checkout -q $localpobranch && (
+    git pull -q
     EDITOR=/bin/true VISUAL=/usr/bin/editor "$quasselsrc"/po/pull-from-transifex.sh -f &&
       git push -q
   ); git checkout -q "$currb"