@@ -121,12 +121,10 @@ function updateStandardRepo() {
121121 cd ${! repo_source} # value of variable called repo, e.g. value of $release_source
122122 echogreen " Update $comm_repo "
123123 cd $comm_repo
124- hg pull -r default
125- hg update -C
124+ hg pull -r default --update
126125 echogreen " Update $mozilla_repo "
127126 cd ../$mozilla_repo
128- hg pull -r default
129- hg update -C
127+ hg pull -r default --update
130128
131129 if $all_locales
132130 then
@@ -137,8 +135,7 @@ function updateStandardRepo() {
137135 then
138136 echogreen " Update $repo_name /$locale "
139137 cd $locale
140- hg pull -r default
141- hg update -C
138+ hg pull -r default --update
142139 cd ..
143140 else
144141 echored " Folder ${! repo_l10n} /$locale does not exist. Run setup.sh to fix the issue."
@@ -149,8 +146,7 @@ function updateStandardRepo() {
149146 then
150147 echogreen " Update $repo_name /$locale_code "
151148 cd ${! repo_l10n} /$locale_code
152- hg pull -r default
153- hg update -C
149+ hg pull -r default --update
154150 cd ..
155151 else
156152 echored " Folder ${! repo_l10n} /$locale_code does not exist."
@@ -191,8 +187,7 @@ function updateNoBranchRepo() {
191187 # These repos exist only on trunk
192188 cd $trunk_source /$1
193189 echogreen " Update $1 "
194- hg pull -r default
195- hg update -C
190+ hg pull -r default --update
196191 fi
197192}
198193
@@ -221,8 +216,7 @@ function updateGaiaRepo() {
221216 then
222217 echogreen " Update $repo_name /$locale "
223218 cd $locale
224- hg pull -r default
225- hg update -C
219+ hg pull -r default --update
226220 cd ..
227221 else
228222 echored " Folder ${! repo_name} /$locale does not exist. Run setup.sh to fix the issue."
@@ -233,8 +227,7 @@ function updateGaiaRepo() {
233227 then
234228 echogreen " Update $repo_name /$locale_code "
235229 cd ${! repo_name} /$locale_code
236- hg pull -r default
237- hg update -C
230+ hg pull -r default --update
238231 cd ..
239232 else
240233 echored " Folder ${! repo_name} /$locale_code does not exist."
0 commit comments