Mercurial > hg
annotate tests/test-merge7.t @ 38722:2009d84f245a
hook: disable the shell to native command translation by default
There are other things I want to add like ~ expansion and translating single to
double quotes for cmd.exe. So off by default is safer.
I'm having second thoughts about the name, but I don't have any better ideas.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 15 Jul 2018 23:46:09 -0400 |
parents | d4e62df1c73d |
children | 91a0bc50b288 |
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) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30460
diff
changeset
|
44 new changesets 96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
45 (run 'hg heads' to see heads, 'hg merge' to merge) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
46 $ hg merge |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
47 merging test.txt |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
48 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
|
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34661
diff
changeset
|
50 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' 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) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30460
diff
changeset
|
81 new changesets 40d11a4173a8 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
82 (run 'hg heads' to see heads, 'hg merge' to merge) |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
83 $ hg merge --debug |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
84 searching for copies back to rev 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
85 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
86 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15501
diff
changeset
|
87 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
|
88 preserving test.txt for resolve of test.txt |
28318
564a354f7f35
tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents:
27161
diff
changeset
|
89 starting 4 threads for background file closing (?) |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
90 test.txt: versions differ -> m (premerge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
91 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
92 merging test.txt |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
93 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
|
94 test.txt: versions differ -> m (merge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
95 picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
26517
diff
changeset
|
96 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
|
97 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
|
98 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34661
diff
changeset
|
99 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
100 [1] |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
101 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
102 $ cat test.txt |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
103 one |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
104 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
105 two-point-five |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
106 ======= |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
107 two-point-one |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28318
diff
changeset
|
108 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
109 three |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
110 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12316
diff
changeset
|
111 $ hg debugindex test.txt |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
112 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
113 0 0 01365c4cca56 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
114 1 1 7b013192566a 01365c4cca56 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
115 2 2 8fe46a3eb557 01365c4cca56 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
116 3 3 fc3148072371 7b013192566a 8fe46a3eb557 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
117 4 4 d40249267ae3 8fe46a3eb557 000000000000 |
1351
0e2be889ccd7
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
119 $ hg log |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
120 changeset: 4:40d11a4173a8 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
121 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
122 parent: 2:96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
123 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
124 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
125 summary: two -> two-point-one |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
126 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
127 changeset: 3:50c3a7e29886 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
128 parent: 1:d1e159716d41 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
129 parent: 2:96b70246a118 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
130 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
131 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
132 summary: Merge 1 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
133 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
134 changeset: 2:96b70246a118 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
135 parent: 0:b1832b9d912a |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
136 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
137 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
138 summary: Numbers as words |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
139 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
140 changeset: 1:d1e159716d41 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
141 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
142 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
143 summary: 2 -> 2.5 |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
144 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
145 changeset: 0:b1832b9d912a |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
146 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11980
diff
changeset
|
147 date: Thu Jan 01 00:00:00 1970 +0000 |
11980
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
148 summary: Initial |
c443e95d295b
tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6888
diff
changeset
|
149 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
150 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
151 $ cd .. |