equal
deleted
inserted
replaced
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 |