Mercurial > hg
annotate tests/test-conflict.t @ 30823:806a830e6612
shelve: allow multiple shelves with --patch and --stat
Before this patch, there was a single way to see multiple shelves using
`--patch --list` which show all the shelves. Doing `--patch s1 s2` returns an
error. This patch allows to show multiple shelves using `--patch` and `--stat`.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 14 Jan 2017 01:23:07 +0530 |
parents | ce3a133f71b3 |
children | 458f7294dfee |
rev | line source |
---|---|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
1 $ hg init |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
2 $ cat << EOF > a |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
3 > Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
4 > One |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
5 > Two |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
6 > Three |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
7 > Four |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
8 > Five |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
9 > Hop we are done. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
10 > EOF |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
11 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
12 $ hg commit -m ancestor |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
13 $ cat << EOF > a |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
14 > Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
15 > 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
16 > 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
17 > 3 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
18 > 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
19 > 5 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
20 > Hop we are done. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
21 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
22 $ hg commit -m branch1 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
23 $ hg co 0 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
25 $ cat << EOF > a |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
26 > Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
27 > 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
28 > 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
29 > 3 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
30 > 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
31 > 8 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
32 > Hop we are done. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
33 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
34 $ hg commit -m branch2 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
35 created new head |
346 | 36 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
37 $ hg merge 1 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
38 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
39 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
40 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
41 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
42 [1] |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
43 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
44 $ hg id |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
45 618808747361+c0c68e4fe667+ tip |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
46 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
47 $ cat a |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
48 Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
49 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
50 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
51 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
52 <<<<<<< working copy: 618808747361 - test: branch2 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
53 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
54 8 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
55 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
56 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
57 5 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
58 >>>>>>> merge rev: c0c68e4fe667 - test: branch1 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
59 Hop we are done. |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
60 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
61 $ hg status |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
62 M a |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
63 ? a.orig |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
64 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
65 Verify custom conflict markers |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
66 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
67 $ hg up -q --clean . |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
68 $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
69 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
70 $ hg merge 1 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
71 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
72 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
73 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
74 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
75 [1] |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
76 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
77 $ cat a |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
78 Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
79 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
80 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
81 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
82 <<<<<<< working copy: test 2 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
83 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
84 8 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
85 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
86 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
87 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
88 >>>>>>> merge rev: test 1 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
89 Hop we are done. |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
90 |
21864
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
91 Verify line splitting of custom conflict marker which causes multiple lines |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
92 |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
93 $ hg up -q --clean . |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
94 $ cat >> .hg/hgrc <<EOF |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
95 > [ui] |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
96 > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
97 > EOF |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
98 |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
99 $ hg -q merge 1 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
100 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
21864
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
101 [1] |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
102 |
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
103 $ cat a |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
104 Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
105 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
106 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
107 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
108 <<<<<<< working copy: test 2 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
109 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
110 8 |
21864
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
111 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
112 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
113 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
114 >>>>>>> merge rev: test 1 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
115 Hop we are done. |
21864
755bf1bbe0a9
filemerge: use only the first line of the generated conflict marker for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
116 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
117 Verify line trimming of custom conflict marker using multi-byte characters |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
118 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
119 $ hg up -q --clean . |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
120 $ python <<EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
121 > fp = open('logfile', 'w') |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
122 > fp.write('12345678901234567890123456789012345678901234567890' + |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
123 > '1234567890') # there are 5 more columns for 80 columns |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
124 > |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
125 > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
126 > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
127 > |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
128 > fp.close() |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
129 > EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
130 $ hg add logfile |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
131 $ hg --encoding utf-8 commit --logfile logfile |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
132 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
133 $ cat >> .hg/hgrc <<EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
134 > [ui] |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
135 > mergemarkertemplate={desc|firstline} |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
136 > EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
137 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
138 $ hg -q --encoding utf-8 merge 1 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
139 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
140 [1] |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
141 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
142 $ cat a |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
143 Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
144 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
145 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
146 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
147 <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345... |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
148 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
149 8 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
150 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
151 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
152 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
153 >>>>>>> merge rev: branch1 |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
154 Hop we are done. |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
155 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
156 Verify basic conflict markers |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
157 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
158 $ hg up -q --clean 2 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
159 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
160 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
161 $ hg merge 1 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
162 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
163 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
164 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
165 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
166 [1] |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
167 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
168 $ cat a |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
169 Small Mathematical Series. |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
170 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
171 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
172 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
173 <<<<<<< working copy |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
174 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
175 8 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
176 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
177 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
178 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
179 >>>>>>> merge rev |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
180 Hop we are done. |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
181 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
182 internal:merge3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
183 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
184 $ hg up -q --clean . |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
185 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
186 $ hg merge 1 --tool internal:merge3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
187 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
188 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
189 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
190 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
191 [1] |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
192 $ cat a |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
193 Small Mathematical Series. |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
194 <<<<<<< working copy |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
195 1 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
196 2 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
197 3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
198 6 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
199 8 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
200 ||||||| base |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
201 One |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
202 Two |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
203 Three |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
204 Four |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
205 Five |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
206 ======= |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
207 1 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
208 2 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
209 3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
210 4 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
211 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
212 >>>>>>> merge rev |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
213 Hop we are done. |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
214 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
215 Add some unconflicting changes on each head, to make sure we really |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
216 are merging, unlike :local and :other |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
217 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
218 $ hg up -C |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
219 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
220 1 other heads for branch "default" |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
221 $ printf "\n\nEnd of file\n" >> a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
222 $ hg ci -m "Add some stuff at the end" |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
223 $ hg up -r 1 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
224 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
225 $ printf "Start of file\n\n\n" > tmp |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
226 $ cat a >> tmp |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
227 $ mv tmp a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
228 $ hg ci -m "Add some stuff at the beginning" |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
229 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
230 Now test :merge-other and :merge-local |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
231 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
232 $ hg merge |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
233 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
234 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
235 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
236 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
237 [1] |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
238 $ hg resolve --tool :merge-other a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
239 merging a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
240 (no more unresolved files) |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
241 $ cat a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
242 Start of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
243 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
244 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
245 Small Mathematical Series. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
246 1 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
247 2 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
248 3 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
249 6 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
250 8 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
251 Hop we are done. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
252 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
253 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
254 End of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
255 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
256 $ hg up -C |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
257 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
258 1 other heads for branch "default" |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
259 $ hg merge --tool :merge-local |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
260 merging a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
261 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
262 (branch merge, don't forget to commit) |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
263 $ cat a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
264 Start of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
265 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
266 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
267 Small Mathematical Series. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
268 1 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
269 2 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
270 3 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
271 4 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
272 5 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
273 Hop we are done. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
274 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
275 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
276 End of file |