Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 2942:f4fc0575e8fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with brendan.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 13:01:40 -0700
parents 1c66aad252f9
children 61fcd9fac434
comparison
equal deleted inserted replaced
2932:d77022db1bca 2942:f4fc0575e8fa
124 cd ../../b 124 cd ../../b
125 echo x>x 125 echo x>x
126 hg ci -Ama 126 hg ci -Ama
127 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' 127 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
128 hg unbundle .hg/strip-backup/* 128 hg unbundle .hg/strip-backup/*
129
130 cat >>$HGTMP/.hgrc <<EOF
131 [diff]
132 git = True
133 EOF
134 cd ..
135 hg init git
136 cd git
137 hg qinit
138
139 hg qnew -m'new file' new
140 echo foo > new
141 chmod +x new
142 hg add new
143 hg qrefresh
144 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
145 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new
146
147 hg qnew -m'copy file' copy
148 hg cp new copy
149 hg qrefresh
150 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
151 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy
152
153 hg qpop
154 hg qpush
155 hg qdiff