Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 2934:2f190e998eb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Teach mq about git patches
author Brendan Cully <brendan@kublai.com>
date Wed, 16 Aug 2006 19:49:45 -0700
parents 307439d6fede
children 1c66aad252f9
comparison
equal deleted inserted replaced
2933:439fd013360d 2934:2f190e998eb3
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/" .hg/patches/new
145
146 hg qnew -m'copy file' copy
147 hg cp new copy
148 hg qrefresh
149 sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy
150
151 hg qpop
152 hg qpush
153 hg qdiff