Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq @ 4065:8ee983e3d461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strip'ping the second parent of a merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 06 Feb 2007 15:54:58 -0200
parents 4c158de5f245
children 165abe554c80 785ad8cd1d31
comparison
equal deleted inserted replaced
4064:5d9ede002453 4065:8ee983e3d461
244 hg mv quux fred 244 hg mv quux fred
245 hg mv bleh barney 245 hg mv bleh barney
246 hg qrefresh --git 246 hg qrefresh --git
247 cat .hg/patches/bar 247 cat .hg/patches/bar
248 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . 248 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
249
250 echo '% strip again'
251 cd ..
252 hg init strip
253 cd strip
254 touch foo
255 hg add foo
256 hg ci -m 'add foo' -d '0 0'
257 echo >> foo
258 hg ci -m 'change foo 1' -d '0 0'
259 hg up -C 0
260 echo 1 >> foo
261 hg ci -m 'change foo 2' -d '0 0'
262 HGMERGE=true hg merge
263 hg ci -m merge -d '0 0'
264 hg log
265 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
266 hg log
267