Mercurial > hg
annotate tests/test-contrib.t @ 37296:78103e4138b1
wireproto: port protocol handler to zope.interface
zope.interface is superior to the abc module. Let's port to it.
As part of this, we add tests for interface conformance for
classes implementing the interface.
Differential Revision: https://phab.mercurial-scm.org/D2983
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 23 Mar 2018 16:24:53 -0700 |
parents | acda1977210c |
children | 567bddcb4271 |
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 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
5 Prepare repo-a: |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
6 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12327
diff
changeset
|
7 $ hg init repo-a |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
8 $ cd repo-a |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
9 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
10 $ echo this is file a > a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
11 $ hg add a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
12 $ hg commit -m first |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
13 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
14 $ echo adding to file a >> a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
15 $ hg commit -m second |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
16 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
17 $ echo adding more to file a >> a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
18 $ hg commit -m third |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
19 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
20 $ hg verify |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
21 checking changesets |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
22 checking manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
23 crosschecking files in changesets and manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
24 checking files |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
25 1 files, 3 changesets, 3 total revisions |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
26 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
27 Dumping revlog of file a to stdout: |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
28 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
29 $ $PYTHON "$CONTRIBDIR/dumprevlog" .hg/store/data/a.i |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
30 file: .hg/store/data/a.i |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
31 node: 183d2312b35066fb6b3b449b84efc370d50993d0 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
32 linkrev: 0 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
33 parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
34 length: 15 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
35 -start- |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
36 this is file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
37 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
38 -end- |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
39 node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
40 linkrev: 1 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
41 parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
42 length: 32 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
43 -start- |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
44 this is file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
45 adding to file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
46 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
47 -end- |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
48 node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
49 linkrev: 2 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
50 parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
51 length: 54 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
52 -start- |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
53 this is file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
54 adding to file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
55 adding more to file a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
56 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
57 -end- |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
58 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
59 Dump all revlogs to file repo.dump: |
7229
7946503ec76e
introduce fncache repository layout
Adrian Buehlmann <adrian@cadifra.com>
parents:
6516
diff
changeset
|
60 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
61 $ find .hg/store -name "*.i" | sort | xargs $PYTHON "$CONTRIBDIR/dumprevlog" > ../repo.dump |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
62 $ cd .. |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
63 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
64 Undumping into repo-b: |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
65 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12327
diff
changeset
|
66 $ hg init repo-b |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
67 $ cd repo-b |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
68 $ $PYTHON "$CONTRIBDIR/undumprevlog" < ../repo.dump |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
69 .hg/store/00changelog.i |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
70 .hg/store/00manifest.i |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
71 .hg/store/data/a.i |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
72 $ cd .. |
7229
7946503ec76e
introduce fncache repository layout
Adrian Buehlmann <adrian@cadifra.com>
parents:
6516
diff
changeset
|
73 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
74 Rebuild fncache with clone --pull: |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
75 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
76 $ hg clone --pull -U repo-b repo-c |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
77 requesting all changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
78 adding changesets |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
79 adding manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
80 adding file changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
81 added 3 changesets with 3 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33262
diff
changeset
|
82 new changesets de1da620e7d8:46946d278c50 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
83 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
84 Verify: |
7229
7946503ec76e
introduce fncache repository layout
Adrian Buehlmann <adrian@cadifra.com>
parents:
6516
diff
changeset
|
85 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
86 $ hg -R repo-c verify |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
87 checking changesets |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
88 checking manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
89 crosschecking files in changesets and manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
90 checking files |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
91 1 files, 3 changesets, 3 total revisions |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
92 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
93 Compare repos: |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
94 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
95 $ hg -R repo-c incoming repo-a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
96 comparing with repo-a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
97 searching for changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
98 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11867
diff
changeset
|
99 [1] |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
100 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
101 $ hg -R repo-a incoming repo-c |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
102 comparing with repo-c |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
103 searching for changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
104 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11867
diff
changeset
|
105 [1] |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
106 |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
107 Test simplemerge command: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
108 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
109 $ cp "$CONTRIBDIR/simplemerge" . |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
110 $ echo base > base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
111 $ echo local > local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
112 $ cat base >> local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
113 $ cp local orig |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
114 $ cat base > other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
115 $ echo other >> other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
116 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
117 changing local directly |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
118 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
119 $ $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
|
120 merge succeeded |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
121 $ cat local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
122 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
123 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
124 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
125 $ cp orig local |
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 printing to stdout |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
128 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
129 $ $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
|
130 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
131 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
132 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
133 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
134 local: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
135 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
136 $ cat local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
137 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
138 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
139 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
140 conflicts |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
141 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
142 $ 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
|
143 $ 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
|
144 $ 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
|
145 $ 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
|
146 $ 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
|
147 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
148 $ $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
|
149 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
150 <<<<<<< conflict-local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
151 not other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
152 ======= |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
153 other |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
26614
diff
changeset
|
154 >>>>>>> conflict-other |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
155 end |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
156 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
157 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
158 1 label |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
159 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
160 $ $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
|
161 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
162 <<<<<<< foo |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
163 not other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
164 ======= |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
165 other |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
26614
diff
changeset
|
166 >>>>>>> conflict-other |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19205
diff
changeset
|
167 end |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
168 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
169 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
170 2 labels |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
171 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
172 $ $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
|
173 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
174 <<<<<<< foo |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
175 not other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
176 ======= |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
177 other |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
26614
diff
changeset
|
178 >>>>>>> bar |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19205
diff
changeset
|
179 end |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
180 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
181 |
22024
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
182 3 labels |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
183 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
184 $ $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
|
185 base |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
186 <<<<<<< foo |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
187 not other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
188 end |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
189 ||||||| base |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
190 ======= |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
191 other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
192 end |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
193 >>>>>>> bar |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
194 [1] |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
195 |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
196 too many labels |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
197 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
198 $ $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
|
199 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
|
200 [255] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
201 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
202 binary file |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
203 |
36031
acda1977210c
py3: replace file() with open() in test-contrib.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34661
diff
changeset
|
204 $ $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
|
205 $ cat orig >> binary-local |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
206 $ $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
|
207 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
|
208 [1] |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
209 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
210 binary file --text |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
211 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
212 $ $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
|
213 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
|
214 \x00local (esc) |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
215 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
216 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
217 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
218 help |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
219 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
220 $ $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
|
221 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
|
222 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
223 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
|
224 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
225 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
|
226 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
227 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
|
228 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
229 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
230 -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
|
231 -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
|
232 -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
|
233 --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
|
234 -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
|
235 -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
|
236 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
237 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
|
238 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
239 $ $PYTHON simplemerge |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
240 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
|
241 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
|
242 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
243 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
|
244 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
245 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
|
246 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
247 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
|
248 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
249 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
250 -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
|
251 -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
|
252 -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
|
253 --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
|
254 -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
|
255 -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
|
256 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
257 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
258 bad option |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
259 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
28072
diff
changeset
|
260 $ $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
|
261 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
|
262 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
|
263 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
264 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
|
265 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
266 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
|
267 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
268 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
|
269 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
270 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
271 -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
|
272 -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
|
273 -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
|
274 --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
|
275 -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
|
276 -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
|
277 [1] |