##// END OF EJS Templates
mq: don't suggest to refresh when qpushing with no applied patches
Idan Kamara -
r14191:e1c34ce3 default
parent child Browse files
Show More
@@ -1127,7 +1127,7 b' class queue(object):'
1127 1127 self.ui.warn(_('patch series already fully applied\n'))
1128 1128 return 1
1129 1129 if not force:
1130 self.check_localchanges(repo)
1130 self.check_localchanges(repo, refresh=self.applied)
1131 1131
1132 1132 if exact:
1133 1133 if move:
@@ -163,7 +163,7 b' qpush --exact --force with changes to an'
163 163 $ hg update 1 -q
164 164 $ echo c0 >> f0
165 165 $ hg qpush -e
166 abort: local changes found, refresh first
166 abort: local changes found
167 167 [255]
168 168 $ hg qpush -ef
169 169 applying p0
@@ -178,7 +178,7 b' qpush --exact --force with changes to an'
178 178 $ hg update 1 -q
179 179 $ echo c0 >> f0
180 180 $ hg qpush -e p1
181 abort: local changes found, refresh first
181 abort: local changes found
182 182 [255]
183 183 $ hg qpush -e p1 -f
184 184 applying p0
@@ -197,7 +197,7 b' qpush --exact --force with changes to a '
197 197 $ echo cp0-bad >> fp0
198 198 $ hg add fp0
199 199 $ hg qpush -e
200 abort: local changes found, refresh first
200 abort: local changes found
201 201 [255]
202 202 $ hg qpush -ef
203 203 applying p0
@@ -223,7 +223,7 b' qpush --exact --force with changes to a '
223 223 $ echo cp1-bad >> fp1
224 224 $ hg add fp1
225 225 $ hg qpush -e p1
226 abort: local changes found, refresh first
226 abort: local changes found
227 227 [255]
228 228 $ hg qpush -e p1 -f
229 229 applying p0
@@ -1271,7 +1271,7 b' test qpush with --force, issue1087'
1271 1271 qpush should fail, local changes
1272 1272
1273 1273 $ hg qpush
1274 abort: local changes found, refresh first
1274 abort: local changes found
1275 1275 [255]
1276 1276
1277 1277
@@ -1317,7 +1317,7 b' apply force, should not discard changes '
1317 1317 qpush should fail, local changes
1318 1318
1319 1319 $ hg qpush
1320 abort: local changes found, refresh first
1320 abort: local changes found
1321 1321 [255]
1322 1322
1323 1323
General Comments 0
You need to be logged in to leave comments. Login now