Skip to content

Commit

Permalink
Use --no-backup with hg revert.
Browse files Browse the repository at this point in the history
This avoids having to remove the .orig files manually later.
  • Loading branch information
friedelwolff committed Aug 30, 2012
1 parent 7c303f2 commit bf3fd27
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tools/mozilla/build_firefox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ do
if [ -d ${lang} ]; then
if [ -d ${lang}/.hg ]; then
(cd ${lang}
hg revert $hgverbosity --all -r default
hg revert $hgverbosity --no-backup --all -r default
hg pull $hgverbosity -u
hg update $hgverbosity -C)
else
Expand All @@ -198,7 +198,6 @@ do
else
hg clone $hgverbosity http://hg.mozilla.org/releases/l10n/mozilla-aurora/${lang} ${lang} || mkdir ${lang}
fi
find ${lang} -name '*.orig' | xargs --no-run-if-empty rm
fi
done

Expand Down Expand Up @@ -347,8 +346,7 @@ do
# Revert some files that need careful human review or authorisation
if [ -d ${L10N_DIR}/${lang}/.hg ]; then
(cd ${L10N_DIR}/${lang}
hg revert $hgverbosity browser/chrome/browser-region/region.properties browser/searchplugins/list.txt
rm -f browser/chrome/browser-region/region.properties.orig browser/searchplugins/list.txt.orig )
hg revert $hgverbosity --no-backup browser/chrome/browser-region/region.properties browser/searchplugins/list.txt
fi
fi

Expand Down

0 comments on commit bf3fd27

Please sign in to comment.