annotate tests/test-contrib.t @ 43853:4f40dc190f63 stable

remotefilelog: remove most of the debugwait* command in the tests Since we use a dedicated developer config, we do not need them anymore. Differential Revision: https://phab.mercurial-scm.org/D7589
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 09 Dec 2019 11:26:53 +0100
parents 5abc47d4ca6b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
1 Set vars:
6465
9b340e725c11 add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
2
16350
4f795f5fbb0b tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15447
diff changeset
3 $ CONTRIBDIR="$TESTDIR/../contrib"
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
4
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
5 Test simplemerge command:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
6
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
7 $ cp "$CONTRIBDIR/simplemerge" .
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
8 $ echo base > base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
9 $ echo local > local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
10 $ cat base >> local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
11 $ cp local orig
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
12 $ cat base > other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
13 $ echo other >> other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
14
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
15 changing local directly
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
16
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
17 $ "$PYTHON" simplemerge local base other && echo "merge succeeded"
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
18 merge succeeded
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
19 $ cat local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
20 local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
21 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
22 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
23 $ cp orig local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
24
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
25 printing to stdout
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
26
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
27 $ "$PYTHON" simplemerge -p local base other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
28 local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
29 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
30 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
31
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
32 local:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
33
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
34 $ cat local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
35 local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
36 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
37
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
38 conflicts
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
39
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
40 $ cp base conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
41 $ cp other conflict-other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
42 $ echo not other >> conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
43 $ echo end >> conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
44 $ echo end >> conflict-other
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
45
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
46 $ "$PYTHON" simplemerge -p conflict-local base conflict-other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
47 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
48 <<<<<<< conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
49 not other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
50 =======
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
51 other
28072
c3e9269d9602 merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents: 26614
diff changeset
52 >>>>>>> conflict-other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
53 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
54 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
55
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
56 1 label
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
57
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
58 $ "$PYTHON" simplemerge -p -L foo conflict-local base conflict-other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
59 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
60 <<<<<<< foo
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
61 not other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
62 =======
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
63 other
28072
c3e9269d9602 merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents: 26614
diff changeset
64 >>>>>>> conflict-other
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
65 end
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
66 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
67
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
68 2 labels
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
69
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
70 $ "$PYTHON" simplemerge -p -L foo -L bar conflict-local base conflict-other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
71 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
72 <<<<<<< foo
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
73 not other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
74 =======
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
75 other
28072
c3e9269d9602 merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents: 26614
diff changeset
76 >>>>>>> bar
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
77 end
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
78 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
79
22024
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
80 3 labels
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
81
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
82 $ "$PYTHON" simplemerge -p -L foo -L bar -L base conflict-local base conflict-other
22024
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
83 base
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
84 <<<<<<< foo
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
85 not other
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
86 end
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
87 ||||||| base
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
88 =======
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
89 other
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
90 end
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
91 >>>>>>> bar
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
92 [1]
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
93
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
94 too many labels
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
95
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
96 $ "$PYTHON" simplemerge -p -L foo -L bar -L baz -L buz conflict-local base conflict-other
22024
372ae2745acf simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22023
diff changeset
97 abort: can only specify three labels.
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
98 [255]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
99
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
100 binary file
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
101
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
102 $ "$PYTHON" -c "f = open('binary-local', 'w'); f.write('\x00'); f.close()"
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
103 $ cat orig >> binary-local
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
104 $ "$PYTHON" simplemerge -p binary-local base other
14330
473d0aaf7655 fix test broken in merge from stable
Sune Foldager <cryo@cyanite.org>
parents: 14033
diff changeset
105 warning: binary-local looks like a binary file.
473d0aaf7655 fix test broken in merge from stable
Sune Foldager <cryo@cyanite.org>
parents: 14033
diff changeset
106 [1]
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
107
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
108 binary file --text
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
109
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
110 $ "$PYTHON" simplemerge -a -p binary-local base other 2>&1
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
111 warning: binary-local looks like a binary file.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
112 \x00local (esc)
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
113 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
114 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
115
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
116 help
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
117
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
118 $ "$PYTHON" simplemerge --help
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
119 simplemerge [OPTS] LOCAL BASE OTHER
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
120
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
121 Simple three-way file merge utility with a minimal feature set.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
122
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
123 Apply to LOCAL the changes necessary to go from BASE to OTHER.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
124
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
125 By default, LOCAL is overwritten with the results of this operation.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
126
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
127 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
128 -L --label labels to use on conflict markers
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
129 -a --text treat all files as text
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
130 -p --print print results instead of overwriting LOCAL
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
131 --no-minimal no effect (DEPRECATED)
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
132 -h --help display help and exit
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
133 -q --quiet suppress output
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
134
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
135 wrong number of arguments
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
136
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
137 $ "$PYTHON" simplemerge
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
138 simplemerge: wrong number of arguments
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
139 simplemerge [OPTS] LOCAL BASE OTHER
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
140
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
141 Simple three-way file merge utility with a minimal feature set.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
142
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
143 Apply to LOCAL the changes necessary to go from BASE to OTHER.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
144
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
145 By default, LOCAL is overwritten with the results of this operation.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
146
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
147 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
148 -L --label labels to use on conflict markers
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
149 -a --text treat all files as text
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
150 -p --print print results instead of overwriting LOCAL
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
151 --no-minimal no effect (DEPRECATED)
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
152 -h --help display help and exit
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
153 -q --quiet suppress output
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
154 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
155
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
156 bad option
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
157
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 37407
diff changeset
158 $ "$PYTHON" simplemerge --foo -p local base other
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
159 simplemerge: option --foo not recognized
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
160 simplemerge [OPTS] LOCAL BASE OTHER
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
161
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
162 Simple three-way file merge utility with a minimal feature set.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
163
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
164 Apply to LOCAL the changes necessary to go from BASE to OTHER.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
165
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
166 By default, LOCAL is overwritten with the results of this operation.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
167
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
168 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
169 -L --label labels to use on conflict markers
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
170 -a --text treat all files as text
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
171 -p --print print results instead of overwriting LOCAL
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 19205
diff changeset
172 --no-minimal no effect (DEPRECATED)
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
173 -h --help display help and exit
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
174 -q --quiet suppress output
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
175 [1]