Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 4177:ba51a8225a60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Sat, 10 Mar 2007 17:45:32 -0800
parents e2ed92f4c0f7 7307d2e98b32
children 6cb5be6bd70f
comparison
equal deleted inserted replaced
4170:ac9e891f2c0f 4177:ba51a8225a60
86 echo a >> a 86 echo a >> a
87 hg qrefresh 87 hg qrefresh
88 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \ 88 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \
89 -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ 89 -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
90 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch 90 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch
91
92 echo % empty qrefresh
93
94 hg qrefresh -X a
95 echo 'revision:'
96 hg diff -r -2 -r -1
97 echo 'patch:'
98 cat .hg/patches/test.patch
99 echo 'working dir diff:'
100 hg diff --nodates -q
101 # restore things
102 hg qrefresh
91 103
92 echo % qpop 104 echo % qpop
93 105
94 hg qpop 106 hg qpop
95 107