Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq @ 4096:49237d6ae97d
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 16 Feb 2007 05:27:37 -0200 |
parents | 165abe554c80 785ad8cd1d31 |
children | e2ed92f4c0f7 |
comparison
equal
deleted
inserted
replaced
4085:719488a98ebe | 4096:49237d6ae97d |
---|---|
296 HGMERGE=true hg merge | 296 HGMERGE=true hg merge |
297 hg ci -m merge -d '0 0' | 297 hg ci -m merge -d '0 0' |
298 hg log | 298 hg log |
299 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 299 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
300 hg log | 300 hg log |
301 | 301 cd .. |
302 | |
303 echo '% qclone' | |
304 qlog() | |
305 { | |
306 echo 'main repo:' | |
307 hg log --template ' rev {rev}: {desc}\n' | |
308 echo 'patch repo:' | |
309 hg -R .hg/patches log --template ' rev {rev}: {desc}\n' | |
310 } | |
311 hg init qclonesource | |
312 cd qclonesource | |
313 echo foo > foo | |
314 hg add foo | |
315 hg ci -m 'add foo' | |
316 hg qinit -c | |
317 hg qnew patch1 | |
318 echo bar >> foo | |
319 hg qrefresh -m 'change foo' | |
320 hg qci -m checkpoint | |
321 qlog | |
322 cd .. | |
323 | |
324 # repo with patches applied | |
325 hg qclone qclonesource qclonedest | |
326 cd qclonedest | |
327 qlog | |
328 cd .. | |
329 | |
330 # repo with patches unapplied | |
331 cd qclonesource | |
332 hg qpop -a | |
333 qlog | |
334 cd .. | |
335 hg qclone qclonesource qclonedest2 | |
336 cd qclonedest2 | |
337 qlog | |
338 cd .. | |
339 |