# HG changeset patch # User Andre Heinecke # Date 1363967974 -3600 # Node ID c841eac484741cefc20e7f8ff4429375a4a7c9d0 # Parent f66a6c1a73e7cc48034bad215e9536d4037404c7 First revert then update in the make release script to avoid conflicts diff -r f66a6c1a73e7 -r c841eac48474 contrib/make_flys_release/make_release.sh --- a/contrib/make_flys_release/make_release.sh Fri Mar 22 16:54:43 2013 +0100 +++ b/contrib/make_flys_release/make_release.sh Fri Mar 22 16:59:34 2013 +0100 @@ -136,7 +136,7 @@ echo "Updating sources / Reverting changes" cd $FLYS_SOURCE_DIR for repo in $REPOS; do - cd $repo && hg pull && hg up && hg revert -a && cd $FLYS_SOURCE_DIR + cd $repo && hg pull && hg revert -a && hg up && cd $FLYS_SOURCE_DIR done; fi