Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 5124:06154aff2b1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 08 Aug 2007 23:00:01 +0200
parents fc502517d68d 17d71a79a257
children e14118f92730
comparison
equal deleted inserted replaced
5123:f94dbc6c7eaf 5124:06154aff2b1a
336 hg mv bleh barney 336 hg mv bleh barney
337 hg qrefresh --git 337 hg qrefresh --git
338 cat .hg/patches/bar 338 cat .hg/patches/bar
339 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . 339 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
340 340
341 echo % create a git patch
342 echo a > alexander
343 hg add alexander
344 hg qnew -f --git addalexander
345 grep diff .hg/patches/addalexander
346
347 echo % create a git binary patch
348 cat > writebin.py <<EOF
349 import sys
350 path = sys.argv[1]
351 open(path, 'wb').write('BIN\x00ARY')
352 EOF
353 python writebin.py bucephalus
354
355 python "$TESTDIR/md5sum.py" bucephalus
356 hg add bucephalus
357 hg qnew -f --git addbucephalus
358 grep diff .hg/patches/addbucephalus
359
360 echo % check binary patches can be popped and pushed
361 hg qpop
362 test -f bucephalus && echo % bucephalus should not be there
363 hg qpush
364 test -f bucephalus || echo % bucephalus should be there
365 python "$TESTDIR/md5sum.py" bucephalus
366
367
341 echo '% strip again' 368 echo '% strip again'
342 cd .. 369 cd ..
343 hg init strip 370 hg init strip
344 cd strip 371 cd strip
345 touch foo 372 touch foo
368 hg init qclonesource 395 hg init qclonesource
369 cd qclonesource 396 cd qclonesource
370 echo foo > foo 397 echo foo > foo
371 hg add foo 398 hg add foo
372 hg ci -m 'add foo' 399 hg ci -m 'add foo'
373 hg qinit -c 400 hg qinit
374 hg qnew patch1 401 hg qnew patch1
375 echo bar >> foo 402 echo bar >> foo
376 hg qrefresh -m 'change foo' 403 hg qrefresh -m 'change foo'
404 cd ..
405
406 # repo with unversioned patch dir
407 hg qclone qclonesource failure
408
409 cd qclonesource
410 hg qinit -c
377 hg qci -m checkpoint 411 hg qci -m checkpoint
378 qlog 412 qlog
379 cd .. 413 cd ..
380 414
381 # repo with patches applied 415 # repo with patches applied