annotate tests/test-contrib.t @ 16297:1791d7662d32 stable

tests: eliminate shutdown race and sleeps in test-serve
author Matt Mackall <mpm@selenic.com>
date Wed, 28 Mar 2012 10:29:39 -0500
parents 9910f60a37ee
children 4f795f5fbb0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
1 Set vars:
6465
9b340e725c11 add tests for contrib/dumprevlog and undumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
2
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
3 $ CONTRIBDIR=$TESTDIR/../contrib
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
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
29 $ python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
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
11867
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
61 $ find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
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
20bd477d0e89 tests: unify test-dumprevlog
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
68 $ python $CONTRIBDIR/undumprevlog < ../repo.dump
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
14033
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
107 Test shrink-revlog:
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
108 $ cd repo-a
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
109 $ hg --config extensions.shrink=$CONTRIBDIR/shrink-revlog.py shrink
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 14330
diff changeset
110 shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
14033
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
111 reading revs
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
112 sorting revs
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
113 writing revs
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
114 old file size: 324 bytes ( 0.0 MiB)
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
115 new file size: 324 bytes ( 0.0 MiB)
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
116 shrinkage: 0.0% (1.0x)
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
117 note: old revlog saved in:
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 14330
diff changeset
118 $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 14330
diff changeset
119 $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
14033
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
120 (You can delete those files when you are satisfied that your
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
121 repository is still sane. Running 'hg verify' is strongly recommended.)
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
122 $ hg verify
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
123 checking changesets
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
124 checking manifests
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
125 crosschecking files in changesets and manifests
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
126 checking files
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
127 1 files, 3 changesets, 3 total revisions
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
128 $ cd ..
33e04d3d17f6 test-contrib: add a test for shrink-revlog
Augie Fackler <durin42@gmail.com>
parents: 14032
diff changeset
129
14032
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
130 Test simplemerge command:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
131
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
132 $ cp "$CONTRIBDIR/simplemerge" .
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
133 $ echo base > base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
134 $ echo local > local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
135 $ cat base >> local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
136 $ cp local orig
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
137 $ cat base > other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
138 $ echo other >> other
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 changing local directly
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 $ 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
143 merge succeeded
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
144 $ cat local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
145 local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
146 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
147 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
148 $ cp orig local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
149
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
150 printing to stdout
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
151
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
152 $ 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
153 local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
154 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
155 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
156
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
157 local:
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 $ cat local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
160 local
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
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
163 conflicts
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 $ 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
166 $ 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
167 $ 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
168 $ 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
169 $ echo end >> conflict-other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
170 $ 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
171 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
172 <<<<<<< conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
173 not other
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 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
176 >>>>>>> conflict-other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
177 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
178 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
179 [1]
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 --no-minimal
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
182
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
183 $ python simplemerge -p --no-minimal 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
184 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
185 <<<<<<< conflict-local
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
186 not other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
187 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
188 =======
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
189 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
190 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
191 >>>>>>> conflict-other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
192 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
193 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
194
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
195 1 label
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
196
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
197 $ 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
198 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
199 <<<<<<< foo
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
200 not other
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 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
203 >>>>>>> conflict-other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
204 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
205 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
206 [1]
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 2 labels
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 $ 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
211 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
212 <<<<<<< foo
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
213 not other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
214 =======
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
215 other
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
216 >>>>>>> bar
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
217 end
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
218 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
219 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
220
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
221 too many labels
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 $ python simplemerge -p -L foo -L bar -L baz 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
224 abort: can only specify two labels.
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
225 [255]
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 binary file
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 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
230 $ 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
231 $ 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
232 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
233 [1]
14032
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 binary file --text
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 $ 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
238 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
239 \x00local (esc)
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
240 base
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
241 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 help
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 --help
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
246 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
247
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
248 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
249
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
250 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
251
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
252 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
253
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
254 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
255 -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
256 -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
257 -p --print print results instead of overwriting LOCAL
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
258 --no-minimal do not try to minimize conflict regions
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
259 -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
260 -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
261
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
262 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
263
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
264 $ python simplemerge
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
265 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
266 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
267
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
268 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
269
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
270 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
271
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
272 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
273
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
274 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
275 -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
276 -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
277 -p --print print results instead of overwriting LOCAL
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
278 --no-minimal do not try to minimize conflict regions
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
279 -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
280 -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
281 [1]
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
282
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
283 bad option
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
284
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
285 $ 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
286 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
287 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
288
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
289 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
290
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
291 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
292
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
293 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
294
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
295 options:
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
296 -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
297 -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
298 -p --print print results instead of overwriting LOCAL
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
299 --no-minimal do not try to minimize conflict regions
d98af1420930 test-simplemerge-cmd.t: move all tests into test-contrib.t
Augie Fackler <durin42@gmail.com>
parents: 14031
diff changeset
300 -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
301 -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
302 [1]