Mercurial > hg
annotate tests/test-merge-internal-tools-pattern.t @ 29471:c4fc33c477da
hgweb: expose list of per-repo labels to templates
hgweb currently offers limited functionality for "classifying"
repositories. This patch aims to change that.
The web.labels config option list is introduced. Its values
are exposed to the "index" and "summary" templates. Custom
templates can use template features like ifcontains() to e.g.
look for the presence of a specific label and engage specific
behavior. For example, a site operator may wish to assign a
"defunct" label to a repository so the repository is prominently
marked as dead in repository indexes.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 30 Jun 2016 18:59:53 -0700 |
parents | ff12a6c63c3d |
children | 41ef02ba329b |
rev | line source |
---|---|
26071
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
1 Make sure that the internal merge tools (internal:fail, internal:local, |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
2 internal:union and internal:other) are used when matched by a |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
3 merge-pattern in hgrc |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
4 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
5 Make sure HGMERGE doesn't interfere with the test: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
6 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
7 $ unset HGMERGE |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
8 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
9 $ hg init |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
10 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
11 Initial file contents: |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
12 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
13 $ echo "line 1" > f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
14 $ echo "line 2" >> f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
15 $ echo "line 3" >> f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
16 $ hg ci -Am "revision 0" |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
17 adding f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
18 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
19 $ cat f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
20 line 1 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
21 line 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
22 line 3 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
23 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
24 Branch 1: editing line 1: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
25 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
26 $ sed 's/line 1/first line/' f > f.new |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
27 $ mv f.new f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
28 $ hg ci -Am "edited first line" |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
29 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
30 Branch 2: editing line 3: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
31 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
32 $ hg update 0 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
34 $ sed 's/line 3/third line/' f > f.new |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
35 $ mv f.new f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
36 $ hg ci -Am "edited third line" |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
37 created new head |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
38 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
39 Merge using internal:fail tool: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
40 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
41 $ echo "[merge-patterns]" > .hg/hgrc |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
42 $ echo "* = internal:fail" >> .hg/hgrc |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
43 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
44 $ hg merge |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
45 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:
12257
diff
changeset
|
46 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
|
47 [1] |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
48 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
49 $ cat f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
50 line 1 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
51 line 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
52 third line |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
53 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
54 $ hg stat |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
55 M f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
56 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
57 Merge using internal:local tool: |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
58 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
59 $ hg update -C 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
61 $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
62 $ mv .hg/hgrc.new .hg/hgrc |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
63 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
64 $ hg merge |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
65 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
66 (branch merge, don't forget to commit) |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
67 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
68 $ cat f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
69 line 1 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
70 line 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
71 third line |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
72 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
73 $ hg stat |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
74 M f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
75 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
76 Merge using internal:other tool: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
77 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
78 $ hg update -C 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
80 $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
81 $ mv .hg/hgrc.new .hg/hgrc |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
82 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
83 $ hg merge |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
84 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
85 (branch merge, don't forget to commit) |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
86 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
87 $ cat f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
88 first line |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
89 line 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
90 line 3 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
91 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
92 $ hg stat |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
93 M f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
94 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
95 Merge using default tool: |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
96 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
97 $ hg update -C 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
99 $ rm .hg/hgrc |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
100 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
101 $ hg merge |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
102 merging f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
103 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
104 (branch merge, don't forget to commit) |
6521
a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com>
parents:
diff
changeset
|
105 |
12257
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
106 $ cat f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
107 first line |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
108 line 2 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
109 third line |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
110 |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
111 $ hg stat |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
112 M f |
470e0b1ddc6e
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
113 |
26071
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
114 Merge using internal:union tool: |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
115 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
116 $ hg update -C 2 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
117 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
118 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
119 $ echo "line 4a" >>f |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
120 $ hg ci -Am "Adding fourth line (commit 4)" |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
121 $ hg update 2 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
123 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
124 $ echo "line 4b" >>f |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
125 $ hg ci -Am "Adding fourth line v2 (commit 5)" |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
126 created new head |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
127 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
128 $ echo "[merge-patterns]" > .hg/hgrc |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
129 $ echo "* = internal:union" >> .hg/hgrc |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
130 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
131 $ hg merge 3 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
132 merging f |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
134 (branch merge, don't forget to commit) |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
135 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
136 $ cat f |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
137 line 1 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
138 line 2 |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
139 third line |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
140 line 4b |
ff12a6c63c3d
filemerge: add 'union' merge to internal merge tool
Erik Huelsmann <ehuels@gmail.com>
parents:
12328
diff
changeset
|
141 line 4a |