Mercurial > hg
annotate tests/test-merge7.t @ 15718:c604a3d1969d
icasefs: disuse length check against un-normcase()-ed filenames
this patch disuses length check against un-normcase()-ed filenames
gotten by "os.listdir()", because there is no assurance that
filesystem stores filenames normalized except in letter case, even
though some case insensitive filesystems (in some environment, for
some language setting) store them in such manner.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 24 Dec 2011 00:50:56 +0900 |
parents | efdcce3fd2d5 |
children | f2719b387380 |
rev | line source |
---|---|
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
1 initial |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
2 $ hg init test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
3 $ cd test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
4 $ cat >test.txt <<"EOF" |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
5 > 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
6 > 2 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
7 > 3 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
8 > EOF |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
9 $ hg add test.txt |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
10 $ hg commit -m "Initial" |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
12 clone |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
13 $ cd .. |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
14 $ hg clone test-a test-b |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
15 updating to branch default |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
17 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
18 change test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
19 $ cd test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
20 $ cat >test.txt <<"EOF" |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
21 > one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
22 > two |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
23 > three |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
24 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
25 $ hg commit -m "Numbers as words" |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
27 change test-b |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
28 $ cd ../test-b |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
29 $ cat >test.txt <<"EOF" |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
30 > 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
31 > 2.5 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
32 > 3 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
33 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
34 $ hg commit -m "2 -> 2.5" |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
36 now pull and merge from test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
37 $ hg pull ../test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
38 pulling from ../test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
39 searching for changes |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
40 adding changesets |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
41 adding manifests |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
42 adding file changes |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
43 added 1 changesets with 1 changes to 1 files (+1 heads) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
44 (run 'hg heads' to see heads, 'hg merge' to merge) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
45 $ hg merge |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
46 merging test.txt |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
47 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
14182
diff
changeset
|
48 merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
51 [1] |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
52 resolve conflict |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
53 $ cat >test.txt <<"EOF" |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
54 > one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
55 > two-point-five |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
56 > three |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
57 > EOF |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
58 $ rm -f *.orig |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
59 $ hg resolve -m test.txt |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
60 $ hg commit -m "Merge 1" |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
61 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
62 change test-a again |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
63 $ cd ../test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
64 $ cat >test.txt <<"EOF" |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
65 > one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
66 > two-point-one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
67 > three |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
68 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
69 $ hg commit -m "two -> two-point-one" |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
70 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
71 pull and merge from test-a again |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
72 $ cd ../test-b |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
73 $ hg pull ../test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
74 pulling from ../test-a |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
75 searching for changes |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
76 adding changesets |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
77 adding manifests |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
78 adding file changes |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
79 added 1 changesets with 1 changes to 1 files (+1 heads) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
80 (run 'hg heads' to see heads, 'hg merge' to merge) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
81 $ hg merge --debug |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
82 searching for copies back to rev 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
83 resolving manifests |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15501
diff
changeset
|
84 overwrite: False, partial: False |
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15501
diff
changeset
|
85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
86 test.txt: versions differ -> m |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
87 preserving test.txt for resolve of test.txt |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
88 updating: test.txt 1/1 files (100.00%) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
89 picked tool 'internal:merge' for test.txt (binary False symlink False) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
90 merging test.txt |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
91 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
92 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
14182
diff
changeset
|
93 merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
94 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
95 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
96 [1] |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
97 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
98 $ cat test.txt |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
99 one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
100 <<<<<<< local |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
101 two-point-five |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
102 ======= |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
103 two-point-one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
104 >>>>>>> other |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
105 three |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
106 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12316
diff
changeset
|
107 $ hg debugindex test.txt |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
108 rev offset length base linkrev nodeid p1 p2 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
109 0 0 7 0 0 01365c4cca56 000000000000 000000000000 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
110 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
111 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
112 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
113 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
114 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
115 $ hg log |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
116 changeset: 4:40d11a4173a8 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
117 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
118 parent: 2:96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
119 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
120 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
121 summary: two -> two-point-one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
122 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
123 changeset: 3:50c3a7e29886 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
124 parent: 1:d1e159716d41 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
125 parent: 2:96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
126 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
127 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
128 summary: Merge 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
129 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
130 changeset: 2:96b70246a118 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
131 parent: 0:b1832b9d912a |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
132 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
133 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
134 summary: Numbers as words |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
135 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
136 changeset: 1:d1e159716d41 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
137 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
138 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
139 summary: 2 -> 2.5 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
140 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
141 changeset: 0:b1832b9d912a |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
142 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
143 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
144 summary: Initial |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
145 |