annotate tests/test-merge7.t @ 24735:07200e3332a1

tags: extract .hgtags filenodes cache to a standalone file Resolution of .hgtags filenodes values has historically been a performance pain point for large repositories, where reading individual manifests can take over 100ms. Multiplied by hundreds or even thousands of heads and resolving .hgtags filenodes becomes a performance issue. This patch establishes a standalone cache file holding the .hgtags filenodes for each changeset. After this patch, the .hgtags filenode for any particular changeset should only have to be computed once during the lifetime of the repository. The introduced hgtagsfnodes1 cache file is modeled after the rev branch cache: the cache is effectively an array of entries consisting of a changeset fragment and the filenode for a revision. The file grows in proportion to the length of the repository (24 bytes per changeset) and is truncated when the repository is stripped. The file is not written unless tag info is requested and tags have changed since last time. This patch partially addresses issue4550. Future patches will split the "tags" cache file into per-filter files and will refactor the cache format to not capture the .hgtags fnodes, as these are now stored in the hgtagsfnodes1 cache. This patch is capable of standing alone. We should not have to wait on the tags cache filter split and format refactor for this patch to land.
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 15 Apr 2015 17:42:38 -0400
parents b081decd9062
children bd625cd4e5e7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21693
diff changeset
60 (no more unresolved files)
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
61 $ hg commit -m "Merge 1"
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
62
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
63 change test-a again
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
64 $ cd ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
65 $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
66 > one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
67 > two-point-one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
68 > three
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
69 > EOF
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
70 $ hg commit -m "two -> two-point-one"
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
71
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
72 pull and merge from test-a again
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
73 $ cd ../test-b
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
74 $ hg pull ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
75 pulling from ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
76 searching for changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
77 adding changesets
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
78 adding manifests
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
79 adding file changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
80 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
81 (run 'hg heads' to see heads, 'hg merge' to merge)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
82 $ hg merge --debug
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
83 searching for copies back to rev 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
84 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
85 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15501
diff changeset
86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
87 preserving test.txt for resolve of test.txt
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
88 test.txt: versions differ -> m
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
89 updating: test.txt 1/1 files (100.00%)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
90 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
91 merging test.txt
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
92 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
93 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
94 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
95 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
96 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
97 [1]
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
98
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
99 $ cat test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
100 one
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
101 <<<<<<< local: 50c3a7e29886 - test: Merge 1
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
102 two-point-five
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
103 =======
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
104 two-point-one
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
105 >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
106 three
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
107
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12316
diff changeset
108 $ hg debugindex test.txt
17132
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
109 rev offset length ..... linkrev nodeid p1 p2 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
110 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
111 1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
112 2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
113 3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
114 4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re)
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
115
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
116 $ hg log
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
117 changeset: 4:40d11a4173a8
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
118 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
119 parent: 2:96b70246a118
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
120 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
121 date: Thu Jan 01 00:00:00 1970 +0000
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
122 summary: two -> two-point-one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
123
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
124 changeset: 3:50c3a7e29886
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
125 parent: 1:d1e159716d41
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
126 parent: 2:96b70246a118
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
127 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
128 date: Thu Jan 01 00:00:00 1970 +0000
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
129 summary: Merge 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
130
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
131 changeset: 2:96b70246a118
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
132 parent: 0:b1832b9d912a
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
133 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
134 date: Thu Jan 01 00:00:00 1970 +0000
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
135 summary: Numbers as words
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
136
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
137 changeset: 1:d1e159716d41
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
138 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
139 date: Thu Jan 01 00:00:00 1970 +0000
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
140 summary: 2 -> 2.5
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
141
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
142 changeset: 0:b1832b9d912a
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
143 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
144 date: Thu Jan 01 00:00:00 1970 +0000
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
145 summary: Initial
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
146
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
147
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
148 $ cd ..