Mercurial > hg
annotate tests/test-simplemerge-cmd.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | 7439ea4146f8 |
children | 3c65cdcf3ba6 |
rev | line source |
---|---|
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
2 $ cp "$TESTDIR"/../contrib/simplemerge . |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
3 $ echo base > base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
4 $ echo local > local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
5 $ cat base >> local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
6 $ cp local orig |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
7 $ cat base > other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
8 $ echo other >> other |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
10 changing local directly |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
12 $ python simplemerge local base other && echo "merge succeeded" |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
13 merge succeeded |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
14 $ cat local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
15 local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
16 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
17 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
18 $ cp orig local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
19 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
20 printing to stdout |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
22 $ python simplemerge -p local base other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
23 local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
24 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
25 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
26 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
27 local: |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
28 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
29 $ cat local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
30 local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
31 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
32 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
33 conflicts |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
34 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
35 $ cp base conflict-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
36 $ cp other conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
37 $ echo not other >> conflict-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
38 $ echo end >> conflict-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
39 $ echo end >> conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
40 $ python simplemerge -p conflict-local base conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
41 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
42 <<<<<<< conflict-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
43 not other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
44 ======= |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
45 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
46 >>>>>>> conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
47 end |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
48 warning: conflicts during merge. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
49 [1] |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
50 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
51 --no-minimal |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
52 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
53 $ python simplemerge -p --no-minimal conflict-local base conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
54 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
55 <<<<<<< conflict-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
56 not other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
57 end |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
58 ======= |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
59 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
60 end |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
61 >>>>>>> conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
62 warning: conflicts during merge. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
63 [1] |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
64 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
65 1 label |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
66 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
67 $ python simplemerge -p -L foo conflict-local base conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
68 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
69 <<<<<<< foo |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
70 not other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
71 ======= |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
72 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
73 >>>>>>> conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
74 end |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
75 warning: conflicts during merge. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
76 [1] |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
77 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
78 2 labels |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
79 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
80 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
81 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
82 <<<<<<< foo |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
83 not other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
84 ======= |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
85 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
86 >>>>>>> bar |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
87 end |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
88 warning: conflicts during merge. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
89 [1] |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
90 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
91 too many labels |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
92 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
93 $ python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
94 abort: can only specify two labels. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
95 [255] |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
96 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
97 binary file |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
98 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
99 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
100 $ cat orig >> binary-local |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
101 $ python simplemerge -p binary-local base other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
102 abort: binary-local looks like a binary file. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
103 [255] |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
104 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
105 binary file --text |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
106 |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12488
diff
changeset
|
107 $ python simplemerge -a -p binary-local base other 2>&1 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
108 warning: binary-local looks like a binary file. |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12488
diff
changeset
|
109 \x00local (esc) |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
110 base |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
111 other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
112 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
113 help |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
114 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
115 $ python simplemerge --help |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
116 simplemerge [OPTS] LOCAL BASE OTHER |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
117 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
118 Simple three-way file merge utility with a minimal feature set. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
119 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
120 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
121 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
122 By default, LOCAL is overwritten with the results of this operation. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
123 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
124 options: |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
125 -L --label labels to use on conflict markers |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
126 -a --text treat all files as text |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
127 -p --print print results instead of overwriting LOCAL |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
128 --no-minimal do not try to minimize conflict regions |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
129 -h --help display help and exit |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
130 -q --quiet suppress output |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
131 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
132 wrong number of arguments |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
133 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
134 $ python simplemerge |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
135 simplemerge: wrong number of arguments |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
136 simplemerge [OPTS] LOCAL BASE OTHER |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
137 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
138 Simple three-way file merge utility with a minimal feature set. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
139 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
140 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
141 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
142 By default, LOCAL is overwritten with the results of this operation. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
143 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
144 options: |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
145 -L --label labels to use on conflict markers |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
146 -a --text treat all files as text |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
147 -p --print print results instead of overwriting LOCAL |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
148 --no-minimal do not try to minimize conflict regions |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
149 -h --help display help and exit |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
150 -q --quiet suppress output |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
151 [1] |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
152 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
153 bad option |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
154 |
12488
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
155 $ python simplemerge --foo -p local base other |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
156 simplemerge: option --foo not recognized |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
157 simplemerge [OPTS] LOCAL BASE OTHER |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
158 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
159 Simple three-way file merge utility with a minimal feature set. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
160 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
161 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
162 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
163 By default, LOCAL is overwritten with the results of this operation. |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
164 |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
165 options: |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
166 -L --label labels to use on conflict markers |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
167 -a --text treat all files as text |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
168 -p --print print results instead of overwriting LOCAL |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
169 --no-minimal do not try to minimize conflict regions |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
170 -h --help display help and exit |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
171 -q --quiet suppress output |
73ad7274ccfa
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com>
parents:
8448
diff
changeset
|
172 [1] |