equal
deleted
inserted
replaced
260 M a |
260 M a |
261 % qpush failure |
261 % qpush failure |
262 Patch queue now empty |
262 Patch queue now empty |
263 applying foo |
263 applying foo |
264 applying bar |
264 applying bar |
265 1 out of 1 hunk ignored -- saving rejects to file foo.rej |
265 file foo already exists |
|
266 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
266 patch failed, unable to continue (try -v) |
267 patch failed, unable to continue (try -v) |
267 patch failed, rejects left in working dir |
268 patch failed, rejects left in working dir |
268 Errors during apply, please fix and refresh bar |
269 Errors during apply, please fix and refresh bar |
269 ? foo |
270 ? foo |
270 ? foo.rej |
271 ? foo.rej |
357 --- /dev/null |
358 --- /dev/null |
358 +++ b/fred |
359 +++ b/fred |
359 @@ -0,0 +1,1 @@ |
360 @@ -0,0 +1,1 @@ |
360 +bar |
361 +bar |
361 3 barney (foo) |
362 3 barney (foo) |
|
363 % create a git patch |
|
364 diff --git a/alexander b/alexander |
|
365 % create a git binary patch |
|
366 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
|
367 diff --git a/bucephalus b/bucephalus |
|
368 % check binary patches can be popped and pushed |
|
369 Now at: addalexander |
|
370 applying addbucephalus |
|
371 Now at: addbucephalus |
|
372 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
362 % strip again |
373 % strip again |
363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
374 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
364 merging foo |
375 merging foo |
365 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
376 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
366 (branch merge, don't forget to commit) |
377 (branch merge, don't forget to commit) |
407 user: test |
418 user: test |
408 date: Thu Jan 01 00:00:00 1970 +0000 |
419 date: Thu Jan 01 00:00:00 1970 +0000 |
409 summary: add foo |
420 summary: add foo |
410 |
421 |
411 % qclone |
422 % qclone |
|
423 abort: versioned patch repository not found (see qinit -c) |
|
424 adding .hg/patches/patch1 |
412 main repo: |
425 main repo: |
413 rev 1: change foo |
426 rev 1: change foo |
414 rev 0: add foo |
427 rev 0: add foo |
415 patch repo: |
428 patch repo: |
416 rev 0: checkpoint |
429 rev 0: checkpoint |