Show More
@@ -1501,7 +1501,6 b' def clone(ui, source, dest=None, **opts)' | |||||
1501 | sr = hg.repository(ui, ui.expandpath(source)) |
|
1501 | sr = hg.repository(ui, ui.expandpath(source)) | |
1502 | qbase, destrev = None, None |
|
1502 | qbase, destrev = None, None | |
1503 | if sr.local(): |
|
1503 | if sr.local(): | |
1504 | reposetup(ui, sr) |
|
|||
1505 | if sr.mq.applied: |
|
1504 | if sr.mq.applied: | |
1506 | qbase = revlog.bin(sr.mq.applied[0].rev) |
|
1505 | qbase = revlog.bin(sr.mq.applied[0].rev) | |
1507 | if not hg.islocal(dest): |
|
1506 | if not hg.islocal(dest): | |
@@ -1521,7 +1520,6 b' def clone(ui, source, dest=None, **opts)' | |||||
1521 | if dr.local(): |
|
1520 | if dr.local(): | |
1522 | if qbase: |
|
1521 | if qbase: | |
1523 | ui.note(_('stripping applied patches from destination repo\n')) |
|
1522 | ui.note(_('stripping applied patches from destination repo\n')) | |
1524 | reposetup(ui, dr) |
|
|||
1525 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1523 | dr.mq.strip(dr, qbase, update=False, backup=None) | |
1526 | if not opts['noupdate']: |
|
1524 | if not opts['noupdate']: | |
1527 | ui.note(_('updating destination repo\n')) |
|
1525 | ui.note(_('updating destination repo\n')) |
@@ -264,4 +264,42 b" 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 | cd .. | |||
267 |
|
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 |
@@ -313,3 +313,26 b' user: test' | |||||
313 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
313 | date: Thu Jan 01 00:00:00 1970 +0000 | |
314 | summary: add foo |
|
314 | summary: add foo | |
315 |
|
315 | |||
|
316 | % qclone | |||
|
317 | main repo: | |||
|
318 | rev 1: change foo | |||
|
319 | rev 0: add foo | |||
|
320 | patch repo: | |||
|
321 | rev 0: checkpoint | |||
|
322 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
323 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
324 | main repo: | |||
|
325 | rev 0: add foo | |||
|
326 | patch repo: | |||
|
327 | rev 0: checkpoint | |||
|
328 | Patch queue now empty | |||
|
329 | main repo: | |||
|
330 | rev 0: add foo | |||
|
331 | patch repo: | |||
|
332 | rev 0: checkpoint | |||
|
333 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
334 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
335 | main repo: | |||
|
336 | rev 0: add foo | |||
|
337 | patch repo: | |||
|
338 | rev 0: checkpoint |
General Comments 0
You need to be logged in to leave comments.
Login now