Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq.out @ 5026:48ebd6a83994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test qnew --git
author Patrick Mezard <pmezard@gmail.com>
date Sat, 28 Jul 2007 20:15:54 +0200
parents 27414950abf5
children 06154aff2b1a
comparison
equal deleted inserted replaced
5025:7041869a1bf6 5026:48ebd6a83994
358 --- /dev/null 358 --- /dev/null
359 +++ b/fred 359 +++ b/fred
360 @@ -0,0 +1,1 @@ 360 @@ -0,0 +1,1 @@
361 +bar 361 +bar
362 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
363 % strip again 373 % strip again
364 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
365 merging foo 375 merging foo
366 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
367 (branch merge, don't forget to commit) 377 (branch merge, don't forget to commit)