annotate tests/test-merge7.t @ 26750:9f9ec4abe700

cmdutil: make in-memory changes visible to external editor (issue4378) Before this patch, external editor process for the commit log can't view some in-memory changes (especially, of dirstate), because they aren't written out until the end of transaction (or wlock). This causes unexpected output of Mercurial commands spawned from that editor process. To make in-memory changes visible to external editor process, this patch does: - write (or schedule to write) in-memory dirstate changes, and - set HG_PENDING environment variable, if: - a transaction is running, and - there are in-memory changes to be visible "hg diff" spawned from external editor process for "hg qrefresh" shows: - "changes newly imported into the topmost" before 49148d7868df(*) - "all changes recorded in the topmost by refreshing" after this patch (*) 49148d7868df changed steps invoking editor process Even though backward compatibility may be broken, the latter behavior looks reasonable, because "hg diff" spawned from the editor process consistently shows "what changes new revision records" regardless of invocation context. In fact, issue4378 itself should be resolved by 800e090e9c64, which made 'repo.transaction()' write in-memory dirstate changes out explicitly before starting transaction. It also made "hg qrefresh" imply 'dirstate.write()' before external editor invocation in call chain below. - mq.queue.refresh - strip.strip - repair.strip - localrepository.transaction - dirstate.write - localrepository.commit - invoke external editor Though, this patch has '(issue4378)' in own summary line to indicate that issues like issue4378 should be fixed by this. BTW, this patch adds '-m' option to a 'hg ci --amend' execution in 'test-commit-amend.t', to avoid invoking external editor process. In this case, "unsure" states may be changed to "clean" according to timestamp or so on. These changes should be written into pending file, if external editor invocation is required, Then, writing dirstate changes out breaks stability of test, because it shows "transaction abort!/rollback completed" occasionally. Aborting after editor process invocation while commands below may cause similar instability of tests, too (AFAIK, there is no more such one, at this revision) - commit --amend - without --message/--logfile - import - without --message/--logfile, - without --no-commit, - without --bypass, - one of below, and - patch has no description text, or - with --edit - aborting at the 1st patch, which adds or removes file(s) - if it only changes existing files, status is checked only for changed files by 'scmutil.matchfiles()', and transition from "unsure" to "normal" in dirstate doesn't occur (= dirstate isn't changed, and written out) - aborting at the 2nd or later patch implies other pending changes (e.g. changelog), and always causes showing "transaction abort!/rollback completed"
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 17 Oct 2015 01:15:34 +0900
parents 8e6d5b7317e6
children 296d55def9c4
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
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
47 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
48 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
49 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
50 [1]
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
51 resolve conflict
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
52 $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
53 > one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
54 > two-point-five
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
55 > three
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
56 > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
57 $ rm -f *.orig
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
58 $ 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
59 (no more unresolved files)
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
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
84 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15501
diff changeset
85 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
86 preserving test.txt for resolve of test.txt
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
87 test.txt: versions differ -> m (premerge)
26517
d8463a743d7d filemerge: normalize 'internal:foo' names to ':foo'
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
88 picked tool ':merge' for test.txt (binary False symlink False)
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
89 merging test.txt
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11980
diff changeset
90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
91 test.txt: versions differ -> m (merge)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
92 picked tool ':merge' for test.txt (binary False symlink False)
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
93 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
94 warning: conflicts while merging test.txt! (edit, 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 ..