Mercurial > hg
view tests/test-mq-git.out @ 10338:ade04c5ae7bb
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 06 Feb 2010 15:21:48 +0100 |
| parents | 9c2c94934f0d |
| children | 8cb81d75730c |
line wrap: on
line source
% git=auto: regular patch creation # HG changeset patch # Date 0 0 diff -r 000000000000 -r ef8dafc9fa4c a --- /dev/null +++ b/a @@ -0,0 +1,1 @@ +a % git=auto: git patch creation with copy # HG changeset patch # Date 0 0 diff --git a/a b/b copy from a copy to b % git=auto: git patch when using --git # HG changeset patch # Date 0 0 diff --git a/regular b/regular new file mode 100644 --- /dev/null +++ b/regular @@ -0,0 +1,1 @@ +regular % git=auto: regular patch after qrefresh without --git # HG changeset patch # Date 0 0 diff -r 2962f232b49d regular --- /dev/null +++ b/regular @@ -0,0 +1,1 @@ +regular % git=keep: git patch with --git # HG changeset patch # Date 0 0 diff --git a/a b/a new file mode 100644 --- /dev/null +++ b/a @@ -0,0 +1,1 @@ +a % git=keep: git patch after qrefresh without --git # HG changeset patch # Date 0 0 diff --git a/a b/a new file mode 100644 --- /dev/null +++ b/a @@ -0,0 +1,2 @@ +a +a % git=yes: git patch # HG changeset patch # Date 0 0 diff --git a/a b/a new file mode 100644 --- /dev/null +++ b/a @@ -0,0 +1,1 @@ +a % git=yes: git patch after qrefresh # HG changeset patch # Date 0 0 diff --git a/a b/a new file mode 100644 --- /dev/null +++ b/a @@ -0,0 +1,2 @@ +a +a % git=no: regular patch with copy # HG changeset patch # Date 0 0 diff -r ef8dafc9fa4c -r 110cde11d262 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +a % git=no: regular patch after qrefresh with copy # HG changeset patch # Date 0 0 diff -r ef8dafc9fa4c b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +a diff -r ef8dafc9fa4c c --- /dev/null +++ b/c @@ -0,0 +1,1 @@ +a