Mercurial > hg
comparison tests/test-mq-git.out @ 10490:f2618cacb485 stable
filelog: sort meta entries, ensure deterministic order
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
---|---|
date | Tue, 16 Feb 2010 21:04:04 +0100 |
parents | 8cb81d75730c |
children |
comparison
equal
deleted
inserted
replaced
10489:3232dba5d521 | 10490:f2618cacb485 |
---|---|
16 diff --git a/a b/b | 16 diff --git a/a b/b |
17 copy from a | 17 copy from a |
18 copy to b | 18 copy to b |
19 % git=auto: git patch when using --git | 19 % git=auto: git patch when using --git |
20 # HG changeset patch | 20 # HG changeset patch |
21 # Parent 2962f232b49d41ebc26c591ec8d556724be213ab | 21 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
22 # Date 0 0 | 22 # Date 0 0 |
23 | 23 |
24 diff --git a/regular b/regular | 24 diff --git a/regular b/regular |
25 new file mode 100644 | 25 new file mode 100644 |
26 --- /dev/null | 26 --- /dev/null |
27 +++ b/regular | 27 +++ b/regular |
28 @@ -0,0 +1,1 @@ | 28 @@ -0,0 +1,1 @@ |
29 +regular | 29 +regular |
30 % git=auto: regular patch after qrefresh without --git | 30 % git=auto: regular patch after qrefresh without --git |
31 # HG changeset patch | 31 # HG changeset patch |
32 # Parent 2962f232b49d41ebc26c591ec8d556724be213ab | 32 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
33 # Date 0 0 | 33 # Date 0 0 |
34 | 34 |
35 diff -r 2962f232b49d regular | 35 diff -r 99586d5f048c regular |
36 --- /dev/null | 36 --- /dev/null |
37 +++ b/regular | 37 +++ b/regular |
38 @@ -0,0 +1,1 @@ | 38 @@ -0,0 +1,1 @@ |
39 +regular | 39 +regular |
40 % git=keep: git patch with --git | 40 % git=keep: git patch with --git |
86 % git=no: regular patch with copy | 86 % git=no: regular patch with copy |
87 # HG changeset patch | 87 # HG changeset patch |
88 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | 88 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
89 # Date 0 0 | 89 # Date 0 0 |
90 | 90 |
91 diff -r ef8dafc9fa4c -r 110cde11d262 b | 91 diff -r ef8dafc9fa4c -r a70404f79ba3 b |
92 --- /dev/null | 92 --- /dev/null |
93 +++ b/b | 93 +++ b/b |
94 @@ -0,0 +1,1 @@ | 94 @@ -0,0 +1,1 @@ |
95 +a | 95 +a |
96 % git=no: regular patch after qrefresh with copy | 96 % git=no: regular patch after qrefresh with copy |