Mercurial > hg
annotate tests/test-contrib.t @ 25305:884ef09cf658 stable
convert: properly pass null ids through .hgtags (issue4678)
Mercurial uses tags of null to mark deletions, but convert was
silently discarding these because it had no mapping for them. Thus, it
was resurrecting deleted tags.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 27 May 2015 14:28:29 -0500 |
parents | c63a09b6b337 |
children | ef1eb6df7071 |
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 |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15447
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 |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15447
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 |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15447
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 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
82 |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
83 Verify: |
7229
7946503ec76e
introduce fncache repository layout
Adrian Buehlmann <adrian@cadifra.com>
parents:
6516
diff
changeset
|
84 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
85 $ hg -R repo-c verify |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
86 checking changesets |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
87 checking manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
88 crosschecking files in changesets and manifests |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
89 checking files |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
90 1 files, 3 changesets, 3 total revisions |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
91 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
92 Compare repos: |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
93 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
94 $ hg -R repo-c incoming repo-a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
95 comparing with repo-a |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
96 searching for changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
97 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11867
diff
changeset
|
98 [1] |
6465
9b340e725c11
add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
99 |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
100 $ hg -R repo-a incoming repo-c |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
101 comparing with repo-c |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
102 searching for changes |
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
103 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11867
diff
changeset
|
104 [1] |
11867
20bd477d0e89
tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
105 |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
106 Test simplemerge command: |
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 $ cp "$CONTRIBDIR/simplemerge" . |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
109 $ echo base > base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
110 $ echo local > local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
111 $ cat base >> local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
112 $ cp local orig |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
113 $ cat base > other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
114 $ echo other >> 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 changing local directly |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
117 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
118 $ python simplemerge local base other && echo "merge succeeded" |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
119 merge succeeded |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
120 $ cat local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
121 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
122 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
123 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
124 $ cp orig local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
125 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
126 printing to stdout |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
127 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
128 $ python simplemerge -p local base other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
129 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
130 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
131 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
132 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
133 local: |
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 $ cat local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
136 local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
137 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
138 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
139 conflicts |
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 $ 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
|
142 $ 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
|
143 $ 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
|
144 $ 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
|
145 $ 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
|
146 |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
147 $ python simplemerge -p conflict-local base conflict-other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
148 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
149 <<<<<<< conflict-local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
150 not other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
151 end |
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 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
154 end |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
155 >>>>>>> conflict-other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
156 warning: conflicts during merge. |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
157 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
158 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
159 1 label |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
160 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
161 $ python simplemerge -p -L foo conflict-local base conflict-other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
162 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
163 <<<<<<< foo |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
164 not other |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19205
diff
changeset
|
165 end |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
166 ======= |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
167 other |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19205
diff
changeset
|
168 end |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
169 >>>>>>> conflict-other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
170 warning: conflicts during merge. |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
171 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
172 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
173 2 labels |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
174 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
175 $ python simplemerge -p -L foo -L bar conflict-local base conflict-other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
176 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
177 <<<<<<< foo |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
178 not other |
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 ======= |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
181 other |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19205
diff
changeset
|
182 end |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
183 >>>>>>> bar |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
184 warning: conflicts during merge. |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
185 [1] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
186 |
22024
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
187 3 labels |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
188 |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
189 $ python simplemerge -p -L foo -L bar -L base conflict-local base conflict-other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
190 base |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
191 <<<<<<< foo |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
192 not other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
193 end |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
194 ||||||| base |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
195 ======= |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
196 other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
197 end |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
198 >>>>>>> bar |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
199 warning: conflicts during merge. |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
200 [1] |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
201 |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
202 too many labels |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
203 |
22024
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
204 $ python simplemerge -p -L foo -L bar -L baz -L buz conflict-local base conflict-other |
372ae2745acf
simplemerge: support three labels when merging
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22023
diff
changeset
|
205 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
|
206 [255] |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
207 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
208 binary file |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
209 |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22024
diff
changeset
|
210 $ $PYTHON -c "f = file('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
|
211 $ cat orig >> binary-local |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
212 $ 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
|
213 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
|
214 [1] |
14032
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
215 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
216 binary file --text |
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 $ python simplemerge -a -p binary-local base other 2>&1 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
219 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
|
220 \x00local (esc) |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
221 base |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
222 other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
223 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
224 help |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
225 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
226 $ python simplemerge --help |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
227 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
|
228 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
229 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
|
230 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
231 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
|
232 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
233 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
|
234 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
235 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
236 -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
|
237 -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
|
238 -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
|
239 --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
|
240 -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
|
241 -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
|
242 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
243 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
|
244 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
245 $ python simplemerge |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
246 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
|
247 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
|
248 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
249 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
|
250 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
251 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
|
252 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
253 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
|
254 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
255 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
256 -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
|
257 -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
|
258 -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
|
259 --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
|
260 -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
|
261 -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
|
262 [1] |
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 bad option |
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 $ python simplemerge --foo -p local base other |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
267 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
|
268 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
|
269 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
270 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
|
271 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
272 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
|
273 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
274 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
|
275 |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
276 options: |
d98af1420930
test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents:
14031
diff
changeset
|
277 -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
|
278 -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
|
279 -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
|
280 --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
|
281 -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
|
282 -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
|
283 [1] |