comparison tests/test-mq-subrepo.t @ 27420:bbf544b5f2e9

mq: consistently use qrefresh
author timeless@mozdev.org
date Wed, 14 Oct 2015 03:30:27 -0400
parents 143b52fce68e
children a2804ddcf9ae
comparison
equal deleted inserted replaced
27419:aaa33ec3c951 27420:bbf544b5f2e9
241 241
242 qpop 242 qpop
243 $ hg -R sub update 0000 243 $ hg -R sub update 0000
244 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 244 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
245 $ hg qpop 245 $ hg qpop
246 abort: local changed subrepos found, refresh first 246 abort: local changed subrepos found, qrefresh first
247 [255] 247 [255]
248 $ hg revert sub 248 $ hg revert sub
249 reverting subrepo sub 249 reverting subrepo sub
250 adding sub/a (glob) 250 adding sub/a (glob)
251 $ hg qpop 251 $ hg qpop
260 260
261 qpush 261 qpush
262 $ hg -R sub update 0000 262 $ hg -R sub update 0000
263 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 263 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
264 $ hg qpush 264 $ hg qpush
265 abort: local changed subrepos found, refresh first 265 abort: local changed subrepos found, qrefresh first
266 [255] 266 [255]
267 $ hg revert sub 267 $ hg revert sub
268 reverting subrepo sub 268 reverting subrepo sub
269 adding sub/a (glob) 269 adding sub/a (glob)
270 $ hg qpush 270 $ hg qpush