Mercurial > hg
annotate tests/test-conflict.t @ 52066:2876d077a796
filelog: drop the CamelCase name for `filelog.filelog`
See 61557734c0ae for the reasoning.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 23 Oct 2024 16:24:18 -0400 |
parents | 55c6ebd11cb9 |
children |
rev | line source |
---|---|
49621
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48590
diff
changeset
|
1 $ hg init repo |
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48590
diff
changeset
|
2 $ cd repo |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
3 $ 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
|
4 > 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
|
5 > One |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
6 > Two |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
7 > Three |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
8 > Four |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
9 > Five |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
10 > 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
|
11 > EOF |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
12 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
13 $ 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
|
14 $ 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
|
15 > 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
|
16 > 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
17 > 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
18 > 3 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
19 > 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
20 > 5 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
21 > 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
|
22 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
23 $ hg commit -m branch1 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
24 $ hg co 0 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
25 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
|
26 $ 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
|
27 > 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
|
28 > 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
29 > 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
30 > 3 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
31 > 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
32 > 8 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
33 > 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
|
34 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11797
diff
changeset
|
35 $ hg commit -m branch2 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
36 created new head |
346 | 37 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
38 $ hg merge 1 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
39 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
40 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
|
41 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33771
diff
changeset
|
42 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
43 [1] |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
44 |
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
45 $ 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
|
46 618808747361+c0c68e4fe667+ tip |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
47 |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
48 $ echo "[commands]" >> $HGRCPATH |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
49 $ echo "status.verbose=true" >> $HGRCPATH |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
50 $ hg status |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
51 M a |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
52 ? a.orig |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
53 # The repository is in an unfinished *merge* state. |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
54 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
55 # Unresolved merge conflicts: |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
56 # |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
57 # a |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
58 # |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
59 # To mark files as resolved: hg resolve --mark FILE |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
60 |
38341
50f5fc232c16
morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35949
diff
changeset
|
61 # To continue: hg commit |
38965
cf68e2649e0a
status: advertise --abort instead of 'update -C .' to abort a merge
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
38341
diff
changeset
|
62 # To abort: hg merge --abort |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
63 |
39736
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
64 $ hg status -Tjson |
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
65 [ |
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
66 { |
43861
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
67 "itemtype": "file", |
39736
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
68 "path": "a", |
43842
7315464f0613
status: add template/json data about whether a file has unresolved conflicts
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
39737
diff
changeset
|
69 "status": "M", |
7315464f0613
status: add template/json data about whether a file has unresolved conflicts
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
39737
diff
changeset
|
70 "unresolved": true |
39736
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
71 }, |
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
72 { |
43861
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
73 "itemtype": "file", |
39736
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
74 "path": "a.orig", |
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
75 "status": "?" |
43861
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
76 }, |
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
77 { |
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
78 "itemtype": "morestatus", |
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
79 "unfinished": "merge", |
aac921f54554
status: outputting structured unfinished-operation information
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
43842
diff
changeset
|
80 "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" |
39736
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
81 } |
e7ae31199ff9
tests: show that the structure of the more status output looks weird
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
82 ] |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
83 |
46077
7a2b67e6b680
status: disable morestatus when using -0
Martin von Zweigbergk <martinvonz@google.com>
parents:
45767
diff
changeset
|
84 $ hg status -0 |
7a2b67e6b680
status: disable morestatus when using -0
Martin von Zweigbergk <martinvonz@google.com>
parents:
45767
diff
changeset
|
85 M a\x00? a.orig\x00 (no-eol) (esc) |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
86 $ 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
|
87 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
|
88 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
89 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
90 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
91 <<<<<<< 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
|
92 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
93 8 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
94 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
95 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
96 5 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
97 >>>>>>> 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
|
98 Hop we are done. |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
99 |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
100 $ hg status --config commands.status.verbose=0 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
101 M a |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
102 ? a.orig |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
103 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
104 Verify custom conflict markers |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
105 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
106 $ hg up -q --clean . |
32047
458f7294dfee
filemerge: optionally strip quotes from merge marker template (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
30460
diff
changeset
|
107 $ cat <<EOF >> .hg/hgrc |
45767
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
108 > [command-templates] |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
109 > mergemarker = '{author} {rev}' |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
110 > EOF |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
111 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
112 $ hg merge 1 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
113 merging a |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
114 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
115 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
116 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
117 [1] |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
118 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
119 $ cat a |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
120 Small Mathematical Series. |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
121 1 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
122 2 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
123 3 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
124 <<<<<<< working copy: test 2 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
125 6 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
126 8 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
127 ======= |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
128 4 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
129 5 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
130 >>>>>>> merge rev: test 1 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
131 Hop we are done. |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
132 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
133 Verify custom conflict markers with legacy config name |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
134 |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
135 $ hg up -q --clean . |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
136 $ cat <<EOF >> .hg/hgrc |
32047
458f7294dfee
filemerge: optionally strip quotes from merge marker template (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
30460
diff
changeset
|
137 > [ui] |
458f7294dfee
filemerge: optionally strip quotes from merge marker template (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
30460
diff
changeset
|
138 > mergemarkertemplate = '{author} {rev}' |
458f7294dfee
filemerge: optionally strip quotes from merge marker template (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
30460
diff
changeset
|
139 > EOF |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
140 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
141 $ hg merge 1 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
142 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
143 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
|
144 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33771
diff
changeset
|
145 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
146 [1] |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
147 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
148 $ 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
|
149 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
|
150 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
151 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
152 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
153 <<<<<<< 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
|
154 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
155 8 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
156 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
157 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
158 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
159 >>>>>>> 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
|
160 Hop we are done. |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
161 |
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
|
162 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
|
163 |
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
|
164 $ 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
|
165 $ cat >> .hg/hgrc <<EOF |
45767
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
166 > [command-templates] |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
167 > mergemarker={author} {rev}\nfoo\nbar\nbaz |
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
|
168 > 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
|
169 |
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
|
170 $ hg -q merge 1 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
171 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
|
172 [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
|
173 |
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
|
174 $ 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
|
175 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
|
176 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
177 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
178 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
179 <<<<<<< 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
|
180 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
181 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
|
182 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
183 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
184 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
185 >>>>>>> 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
|
186 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
|
187 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
188 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
|
189 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
190 $ hg up -q --clean . |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
38965
diff
changeset
|
191 $ "$PYTHON" <<EOF |
35949
80e5210df25c
py3: make sure we open the file in bytes mode
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35947
diff
changeset
|
192 > fp = open('logfile', 'wb') |
35947
a36d3c8a0e41
py3: add b'' prefixes to string literals in test files
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35704
diff
changeset
|
193 > fp.write(b'12345678901234567890123456789012345678901234567890' + |
a36d3c8a0e41
py3: add b'' prefixes to string literals in test files
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35704
diff
changeset
|
194 > b'1234567890') # there are 5 more columns for 80 columns |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
195 > |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
196 > # 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
|
197 > 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
|
198 > |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
199 > fp.close() |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
200 > EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
201 $ 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
|
202 $ 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
|
203 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
204 $ cat >> .hg/hgrc <<EOF |
45767
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
205 > [command-templates] |
40411ad2f5d2
config: rename ui.mergemarkertemplate to command-templates.mergemarker
Martin von Zweigbergk <martinvonz@google.com>
parents:
43861
diff
changeset
|
206 > mergemarker={desc|firstline} |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
207 > EOF |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
208 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
209 $ 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
|
210 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
|
211 [1] |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
212 |
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
213 $ 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
|
214 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
|
215 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
216 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
217 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
218 <<<<<<< 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
|
219 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
220 8 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
221 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
222 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
223 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
224 >>>>>>> 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
|
225 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
|
226 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
227 Verify basic conflict markers |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
228 |
21865
78e56e70c70a
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21864
diff
changeset
|
229 $ hg up -q --clean 2 |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
230 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
231 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
232 $ hg merge 1 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
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') |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
235 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33771
diff
changeset
|
236 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
21519
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
237 [1] |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
238 |
25d5a9ecbb85
merge: add conflict marker formatter (BC)
Durham Goode <durham@fb.com>
parents:
15501
diff
changeset
|
239 $ 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
|
240 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
|
241 1 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
242 2 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
243 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
244 <<<<<<< 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
|
245 6 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
246 8 |
11797
66e4e8e8b1e5
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4387
diff
changeset
|
247 ======= |
21920
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
248 4 |
1d04d3fe616d
test: use more elaborated content in ``test-conflict.t``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21865
diff
changeset
|
249 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
250 >>>>>>> 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
|
251 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
|
252 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
253 internal:merge3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
254 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
255 $ hg up -q --clean . |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
256 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
257 $ 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
|
258 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
259 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
|
260 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33771
diff
changeset
|
261 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
262 [1] |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
263 $ cat a |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
264 Small Mathematical Series. |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
265 <<<<<<< working copy |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
266 1 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
267 2 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
268 3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
269 6 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
270 8 |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48566
diff
changeset
|
271 ||||||| common ancestor |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
272 One |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
273 Two |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
274 Three |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
275 Four |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
276 Five |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
277 ======= |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
278 1 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
279 2 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
280 3 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
281 4 |
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
282 5 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
28072
diff
changeset
|
283 >>>>>>> merge rev |
22028
3d0572ab3b4a
merge: add an internal:merge3 tool
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
21921
diff
changeset
|
284 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
|
285 |
46108
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
286 internal:mergediff |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
287 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
288 $ hg co -C 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
290 $ cat << EOF > a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
291 > Small Mathematical Series. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
292 > 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
293 > 2 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
294 > 3 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
295 > 4 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
296 > 4.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
297 > 5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
298 > Hop we are done. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
299 > EOF |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
300 $ hg co -m 2 -t internal:mergediff |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
301 merging a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
302 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
303 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
304 use 'hg resolve' to retry unresolved file merges |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
305 [1] |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
306 $ cat a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
307 Small Mathematical Series. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
308 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
309 2 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
310 3 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
311 <<<<<<< |
48590
7e503eff3c76
update: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48589
diff
changeset
|
312 ------- working copy parent |
46108
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
313 +++++++ working copy |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
314 4 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
315 +4.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
316 5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
317 ======= destination |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
318 6 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
319 8 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
320 >>>>>>> |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
321 Hop we are done. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
322 Test the same thing as above but modify a bit more so we instead get the working |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
323 copy in full and the diff from base to destination. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
324 $ hg co -C 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
326 $ cat << EOF > a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
327 > Small Mathematical Series. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
328 > 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
329 > 2 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
330 > 3.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
331 > 4.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
332 > 5.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
333 > Hop we are done. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
334 > EOF |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
335 $ hg co -m 2 -t internal:mergediff |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
336 merging a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
337 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
338 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
339 use 'hg resolve' to retry unresolved file merges |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
340 [1] |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
341 $ cat a |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
342 Small Mathematical Series. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
343 1 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
344 2 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
345 <<<<<<< |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
346 ======= working copy |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
347 3.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
348 4.5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
349 5.5 |
48590
7e503eff3c76
update: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48589
diff
changeset
|
350 ------- working copy parent |
46108
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
351 +++++++ destination |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
352 3 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
353 -4 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
354 -5 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
355 +6 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
356 +8 |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
357 >>>>>>> |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
358 Hop we are done. |
bdc2bf68f19e
mergetools: add new conflict marker format with diffs in
Martin von Zweigbergk <martinvonz@google.com>
parents:
46077
diff
changeset
|
359 |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
360 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
|
361 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
|
362 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
363 $ hg up -C |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
364 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32047
diff
changeset
|
365 updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
366 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
|
367 $ 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
|
368 $ 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
|
369 $ 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
|
370 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
|
371 $ 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
|
372 $ cat a >> tmp |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
373 $ mv tmp a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
374 $ 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
|
375 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
376 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
|
377 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
378 $ hg merge |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
379 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26224
diff
changeset
|
380 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
|
381 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33771
diff
changeset
|
382 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
383 [1] |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
384 $ 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
|
385 merging a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
386 (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
|
387 $ cat a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
388 Start of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
389 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
390 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
391 Small Mathematical Series. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
392 1 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
393 2 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
394 3 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
395 6 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
396 8 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
397 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
|
398 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
399 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
400 End of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
401 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
402 $ hg up -C |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
403 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32047
diff
changeset
|
404 updated to "18b51d585961: Add some stuff at the beginning" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
405 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
|
406 $ 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
|
407 merging a |
48566
50de08904c63
merge: consider the file merged when using :merge-{local,other}
Martin von Zweigbergk <martinvonz@google.com>
parents:
48513
diff
changeset
|
408 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
26224
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
409 (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
|
410 $ cat a |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
411 Start of file |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
412 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
413 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
414 Small Mathematical Series. |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
415 1 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
416 2 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
417 3 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
418 4 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
419 5 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
420 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
|
421 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
422 |
a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22028
diff
changeset
|
423 End of file |