Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents e14118f92730
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
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 % refresh omitting an added file
364 C newfile
365 A newfile
366 Now at: bar
367 % create a git patch
368 diff --git a/alexander b/alexander
369 % create a git binary patch
370 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
371 diff --git a/bucephalus b/bucephalus
372 % check binary patches can be popped and pushed
373 Now at: addalexander
374 applying addbucephalus
375 Now at: addbucephalus
376 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
362 % strip again 377 % strip again
363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 378 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
364 merging foo 379 merging foo
365 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 380 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
366 (branch merge, don't forget to commit) 381 (branch merge, don't forget to commit)
407 user: test 422 user: test
408 date: Thu Jan 01 00:00:00 1970 +0000 423 date: Thu Jan 01 00:00:00 1970 +0000
409 summary: add foo 424 summary: add foo
410 425
411 % qclone 426 % qclone
427 abort: versioned patch repository not found (see qinit -c)
428 adding .hg/patches/patch1
412 main repo: 429 main repo:
413 rev 1: change foo 430 rev 1: change foo
414 rev 0: add foo 431 rev 0: add foo
415 patch repo: 432 patch repo:
416 rev 0: checkpoint 433 rev 0: checkpoint