diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-02-25 18:41:40 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-02-25 18:41:40 +0100 |
| commit | 8f559ea8c9b74f32e470c5b984e26ef330bfa9f5 (patch) | |
| tree | 2390bbe39481abe557009c957fa862785d3752ca | |
| parent | 76090ddb2fd5a6be905e2ea5b3a969527c61bf47 (diff) | |
| download | scripts-8f559ea8c9b74f32e470c5b984e26ef330bfa9f5.tar.gz | |
Improve sync-master script -- listing failed merges works
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rwxr-xr-x | sync-master | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sync-master b/sync-master index a8a0946..206fee4 100755 --- a/sync-master +++ b/sync-master @@ -2,7 +2,7 @@ . `dirname $0`/common lco platform/manifest linaro-master cd $SRC/platform/manifest -FAILED="" +rm -f /tmp/failed.list grep 'revision="linaro-master"' default.xml |while read r; do P=`echo $r |sed -e 's,.*name=",,;s,".*,,'` lco $P linaro-master @@ -11,9 +11,13 @@ grep 'revision="linaro-master"' default.xml |while read r; do if git rebase aosp/master; then git push --force gerrit linaro-master else - FAILED="$FAILED $P" + echo $P >>/tmp/failed.list fi done -if [ -n "$FAILED" ]; then - echo "The following projects need manual merges: $FAILED" +if [ -e /tmp/failed.list ]; then + echo + echo "******************************************" + echo "The following projects need manual merges:" + cat /tmp/failed.list + rm -f /tmp/failed.list fi |