equal
deleted
inserted
replaced
262 HGMERGE=true hg merge |
262 HGMERGE=true hg merge |
263 hg ci -m merge -d '0 0' |
263 hg ci -m merge -d '0 0' |
264 hg log |
264 hg log |
265 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
265 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
266 hg log |
266 hg log |
267 |
267 cd .. |
|
268 |
|
269 echo '% qclone' |
|
270 qlog() |
|
271 { |
|
272 echo 'main repo:' |
|
273 hg log --template ' rev {rev}: {desc}\n' |
|
274 echo 'patch repo:' |
|
275 hg -R .hg/patches log --template ' rev {rev}: {desc}\n' |
|
276 } |
|
277 hg init qclonesource |
|
278 cd qclonesource |
|
279 echo foo > foo |
|
280 hg add foo |
|
281 hg ci -m 'add foo' |
|
282 hg qinit -c |
|
283 hg qnew patch1 |
|
284 echo bar >> foo |
|
285 hg qrefresh -m 'change foo' |
|
286 hg qci -m checkpoint |
|
287 qlog |
|
288 cd .. |
|
289 |
|
290 # repo with patches applied |
|
291 hg qclone qclonesource qclonedest |
|
292 cd qclonedest |
|
293 qlog |
|
294 cd .. |
|
295 |
|
296 # repo with patches unapplied |
|
297 cd qclonesource |
|
298 hg qpop -a |
|
299 qlog |
|
300 cd .. |
|
301 hg qclone qclonesource qclonedest2 |
|
302 cd qclonedest2 |
|
303 qlog |
|
304 cd .. |
|
305 |