| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
| Sun, 06 Jul 2014 02:56:41 +0900 | |
| changeset 21865 | 78e56e70c70a |
| parent 21864 | 755bf1bbe0a9 |
| child 21920 | 1d04d3fe616d |
| permissions | -rw-r--r-- |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
1 |
$ hg init |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
2 |
$ echo "nothing" > a |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
3 |
$ hg add a |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
4 |
$ hg commit -m ancestor |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
5 |
$ echo "something" > a |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
6 |
$ hg commit -m branch1 |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
7 |
$ hg co 0 |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
8 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
9 |
$ echo "something else" > a |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
10 |
$ hg commit -m branch2 |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
11 |
created new head |
| 346 | 12 |
|
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
13 |
$ hg merge 1 |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
14 |
merging a |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
15 |
warning: conflicts during merge. |
|
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
16 |
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
17 |
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
|
18 |
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
|
19 |
[1] |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
20 |
|
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
21 |
$ hg id |
|
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
22 |
32e80765d7fe+75234512624c+ tip |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
23 |
|
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
24 |
$ cat a |
|
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21519
diff
changeset
|
25 |
<<<<<<< local: 32e80765d7fe - test: branch2 |
|
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
26 |
something else |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
27 |
======= |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
28 |
something |
|
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21519
diff
changeset
|
29 |
>>>>>>> other: 75234512624c - test: branch1 |
|
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
30 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
31 |
$ hg status |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
32 |
M a |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
33 |
? a.orig |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
34 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
35 |
Verify custom conflict markers |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
36 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
37 |
$ hg up -q --clean . |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
38 |
$ 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
|
39 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
40 |
$ hg merge 1 |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
41 |
merging a |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
42 |
warning: conflicts during merge. |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
43 |
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
44 |
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
|
45 |
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
|
46 |
[1] |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
47 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
48 |
$ cat a |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
49 |
<<<<<<< local: test 2 |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
50 |
something else |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
51 |
======= |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
52 |
something |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
53 |
>>>>>>> other: test 1 |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
54 |
|
|
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
|
55 |
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
|
56 |
|
|
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
|
57 |
$ 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
|
58 |
$ 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
|
59 |
> [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
|
60 |
> 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
|
61 |
> 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
|
62 |
|
|
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
|
63 |
$ hg -q merge 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
|
64 |
warning: conflicts during merge. |
|
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
|
65 |
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
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
|
66 |
[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
|
67 |
|
|
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
|
68 |
$ cat a |
|
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
|
69 |
<<<<<<< local: test 2 |
|
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
|
70 |
something else |
|
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
|
71 |
======= |
|
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
|
72 |
something |
|
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
|
73 |
>>>>>>> other: test 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
|
74 |
|
|
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
75 |
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
|
76 |
|
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
77 |
$ 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
|
78 |
$ python <<EOF |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
79 |
> 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
|
80 |
> 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
|
81 |
> '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
|
82 |
> |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
83 |
> # 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
|
84 |
> 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
|
85 |
> |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
86 |
> fp.close() |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
87 |
> EOF |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
88 |
$ 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
|
89 |
$ 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
|
90 |
|
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
91 |
$ 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
|
92 |
> [ui] |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
93 |
> 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
|
94 |
> EOF |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
95 |
|
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
96 |
$ hg -q --encoding utf-8 merge 1 |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
97 |
warning: conflicts during merge. |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
98 |
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
99 |
[1] |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
100 |
|
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
101 |
$ cat a |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
102 |
<<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
103 |
something else |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
104 |
======= |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
105 |
something |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
106 |
>>>>>>> other: branch1 |
|
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
107 |
|
|
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
108 |
Verify basic conflict markers |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
109 |
|
|
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
110 |
$ hg up -q --clean 2 |
|
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
111 |
$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
112 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
113 |
$ hg merge 1 |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
114 |
merging a |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
115 |
warning: conflicts during merge. |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
116 |
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
117 |
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
|
118 |
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
|
119 |
[1] |
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
120 |
|
|
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
121 |
$ cat a |
|
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
122 |
<<<<<<< local |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
123 |
something else |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
124 |
======= |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
125 |
something |
|
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
126 |
>>>>>>> other |