Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 5294:e14118f92730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.
author Brendan Cully <brendan@kublai.com>
date Mon, 10 Sep 2007 15:00:05 -0700
parents 06154aff2b1a
children
comparison
equal deleted inserted replaced
5290:05889b6b1468 5294:e14118f92730
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 % refresh omitting an added file
342 hg qnew baz
343 echo newfile > newfile
344 hg add newfile
345 hg qrefresh
346 hg st -A newfile
347 hg qrefresh -X newfile
348 hg st -A newfile
349 hg revert newfile
350 rm newfile
351 hg qpop
352 hg qdel baz
353
341 echo % create a git patch 354 echo % create a git patch
342 echo a > alexander 355 echo a > alexander
343 hg add alexander 356 hg add alexander
344 hg qnew -f --git addalexander 357 hg qnew -f --git addalexander
345 grep diff .hg/patches/addalexander 358 grep diff .hg/patches/addalexander