Mercurial > hg
annotate tests/test-tag.t @ 30698:c3db3bb4699f
setup: pass named argument to setup_zstd
The next release from upstream adds another named argument to this
function. Specify arguments by name so there is no ambiguity about
which argument is being passed.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Wed, 04 Jan 2017 19:17:44 -0800 |
parents | 27addd7e8eca |
children | b36318e6d2ef |
rev | line source |
---|---|
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
1 $ hg init test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
2 $ cd test |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
3 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
4 $ echo a > a |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
5 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
6 $ hg commit -m "test" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
7 $ hg history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
8 changeset: 0:acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
9 tag: tip |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
10 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
11 date: Thu Jan 01 00:00:00 1970 +0000 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
12 summary: test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
13 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
14 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
15 $ hg tag ' ' |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
16 abort: tag names cannot consist entirely of whitespace |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
17 [255] |
8417
39cf453da958
clone: try updating to the actual changeset specified in options
Brett Carter <brett@rdnzl.net>
parents:
6321
diff
changeset
|
18 |
21418
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
19 (this tests also that editor is not invoked, if '--edit' is not |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
20 specified) |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
21 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
22 $ HGEDITOR=cat hg tag "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
23 $ hg history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
24 changeset: 1:d4f0d2909abc |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
25 tag: tip |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
26 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
27 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
28 summary: Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
29 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
30 changeset: 0:acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
31 tag: bleah |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
32 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
33 date: Thu Jan 01 00:00:00 1970 +0000 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
34 summary: test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
35 |
11692
52e4ac3e63f7
tag: do not allow tag names to consist solely of whitespace (issue2307)
Benjamin Pollack <benjamin@bitquabit.com>
parents:
11185
diff
changeset
|
36 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
37 $ echo foo >> .hgtags |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
38 $ hg tag "bleah2" |
22680 | 39 abort: working copy of .hgtags is changed |
40 (please commit .hgtags manually) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
41 [255] |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
42 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
43 $ hg revert .hgtags |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
44 $ hg tag -r 0 x y z y y z |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
45 abort: tag names must be unique |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
46 [255] |
17813
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
47 $ hg tag tap nada dot tip |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
48 abort: the name 'tip' is reserved |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
49 [255] |
17813
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
50 $ hg tag . |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
51 abort: the name '.' is reserved |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
52 [255] |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
53 $ hg tag null |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
54 abort: the name 'null' is reserved |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
55 [255] |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
56 $ hg tag "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
57 abort: tag 'bleah' already exists (use -f to force) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
58 [255] |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
59 $ hg tag "blecch" "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
60 abort: tag 'bleah' already exists (use -f to force) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
61 [255] |
6321
55ba3bc5b8fd
tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents:
4933
diff
changeset
|
62 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
63 $ hg tag --remove "blecch" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
64 abort: tag 'blecch' does not exist |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
65 [255] |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
66 $ hg tag --remove "bleah" "blecch" "blough" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
67 abort: tag 'blecch' does not exist |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
68 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
69 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
70 $ hg tag -r 0 "bleah0" |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
71 $ hg tag -l -r 1 "bleah1" |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
72 $ hg tag gack gawk gorp |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
73 $ hg tag -f gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
74 $ hg tag --remove gack gorp |
6321
55ba3bc5b8fd
tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents:
4933
diff
changeset
|
75 |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
76 $ hg tag "bleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
77 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
78 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
79 $ hg tag " bleah" |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
80 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
81 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
82 $ hg tag " bleah" |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
83 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
84 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
85 $ hg tag -r 0 " bleahbleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
86 $ hg tag -r 0 " bleah bleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
87 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
88 $ cat .hgtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
89 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
90 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
91 336fccc858a4eb69609a291105009e484a6b6b8d gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
92 336fccc858a4eb69609a291105009e484a6b6b8d gawk |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
93 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
94 336fccc858a4eb69609a291105009e484a6b6b8d gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
95 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
96 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
97 0000000000000000000000000000000000000000 gack |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
98 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
99 0000000000000000000000000000000000000000 gorp |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
100 acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
101 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
102 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
103 $ cat .hg/localtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
104 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
105 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
106 tagging on a non-head revision |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
107 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
108 $ hg update 0 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
109 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
110 $ hg tag -l localblah |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
111 $ hg tag "foobar" |
30247
27addd7e8eca
tag: clarify warning about making a tag on a branch head
Nathan Goldbaum <ngoldbau@illinois.edu>
parents:
26998
diff
changeset
|
112 abort: working directory is not at a branch head (use -f to force) |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
113 [255] |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
114 $ hg tag -f "foobar" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
115 $ cat .hgtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
116 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
117 $ cat .hg/localtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
118 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
119 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
120 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
121 $ hg tag -l 'xx |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
122 > newline' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17813
diff
changeset
|
123 abort: '\n' cannot be used in a name |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
124 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
125 $ hg tag -l 'xx:xx' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17813
diff
changeset
|
126 abort: ':' cannot be used in a name |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
127 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
128 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
129 cloning local tags |
2647
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
130 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
131 $ cd .. |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
132 $ hg -R test log -r0:5 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
133 changeset: 0:acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
134 tag: bleah |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
135 tag: bleah bleah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
136 tag: bleah0 |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
137 tag: bleahbleah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
138 tag: foobar |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
139 tag: localblah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
140 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
141 date: Thu Jan 01 00:00:00 1970 +0000 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
142 summary: test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
143 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
144 changeset: 1:d4f0d2909abc |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
145 tag: bleah1 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
146 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
147 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
148 summary: Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
149 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
150 changeset: 2:336fccc858a4 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
151 tag: gawk |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
152 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
153 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
154 summary: Added tag bleah0 for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
155 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
156 changeset: 3:799667b6f2d9 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
157 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
158 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
159 summary: Added tag gack, gawk, gorp for changeset 336fccc858a4 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
160 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
161 changeset: 4:154eeb7c0138 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
162 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
163 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
164 summary: Added tag gack for changeset 799667b6f2d9 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
165 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
166 changeset: 5:b4bb47aaff09 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
167 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
169 summary: Removed tag gack, gorp |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
170 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
171 $ hg clone -q -rbleah1 test test1 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
172 $ hg -R test1 parents --style=compact |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
173 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
174 Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
175 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
176 $ hg clone -q -r5 test#bleah1 test2 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
177 $ hg -R test2 parents --style=compact |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
178 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
179 Removed tag gack, gorp |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
180 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
181 $ hg clone -q -U test#bleah1 test3 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
182 $ hg -R test3 parents --style=compact |
4892
d69b1fb111b9
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2647
diff
changeset
|
183 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
184 $ cd test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
185 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
186 Issue601: hg tag doesn't do the right thing if .hgtags or localtags |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
187 doesn't end with EOL |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
188 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
189 $ python << EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
190 > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close() |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
191 > f = file('.hg/localtags', 'w'); f.write(last); f.close() |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
192 > EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
193 $ cat .hg/localtags; echo |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
194 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
195 $ hg tag -l localnewline |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
196 $ cat .hg/localtags; echo |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
197 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
198 c2899151f4e76890c602a2597a650a72666681bf localnewline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
199 |
11063
eb23c876c111
tag: warn users about tag/branch possible name conflicts
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8417
diff
changeset
|
200 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
201 $ python << EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
202 > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close() |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
203 > f = file('.hgtags', 'w'); f.write(last); f.close() |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
204 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
205 $ hg ci -m'broken manual edit of .hgtags' |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
206 $ cat .hgtags; echo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
207 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
208 $ hg tag newline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
209 $ cat .hgtags; echo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
210 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
211 a0eea09de1eeec777b46f2085260a373b2fbc293 newline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
212 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
213 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
214 tag and branch using same name |
11185
6d7cf82453be
tag: add -e/--edit option for modifying the commit message
Steve Losh <steve@stevelosh.com>
parents:
11063
diff
changeset
|
215 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
216 $ hg branch tag-and-branch-same-name |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
217 marked working directory as branch tag-and-branch-same-name |
15615 | 218 (branches are permanent and global, did you want a bookmark?) |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
219 $ hg ci -m"discouraged" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
220 $ hg tag tag-and-branch-same-name |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
221 warning: tag tag-and-branch-same-name conflicts with existing branch name |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
222 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
223 test custom commit messages |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
224 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
225 $ cat > editor.sh << '__EOF__' |
21418
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
226 > echo "==== before editing" |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
227 > cat "$1" |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
228 > echo "====" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
229 > echo "custom tag message" > "$1" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
230 > echo "second line" >> "$1" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
231 > __EOF__ |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
232 |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
233 at first, test saving last-message.txt |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
234 |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
235 (test that editor is not invoked before transaction starting) |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
236 |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
237 $ cat > .hg/hgrc << '__EOF__' |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
238 > [hooks] |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
239 > # this failure occurs before editor invocation |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
240 > pretag.test-saving-lastmessage = false |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
241 > __EOF__ |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
242 $ rm -f .hg/last-message.txt |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
243 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
244 abort: pretag.test-saving-lastmessage hook exited with status 1 |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
245 [255] |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21922
diff
changeset
|
246 $ test -f .hg/last-message.txt |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
247 [1] |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
248 |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
249 (test that editor is invoked and commit message is saved into |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
250 "last-message.txt") |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
251 |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
252 $ cat >> .hg/hgrc << '__EOF__' |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
253 > [hooks] |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
254 > pretag.test-saving-lastmessage = |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
255 > # this failure occurs after editor invocation |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
256 > pretxncommit.unexpectedabort = false |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
257 > __EOF__ |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
258 |
21418
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
259 (this tests also that editor is invoked, if '--edit' is specified, |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
260 regardless of '--message') |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
261 |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
262 $ rm -f .hg/last-message.txt |
21418
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
263 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e -m "foo bar" |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
264 ==== before editing |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
265 foo bar |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
266 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
267 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
268 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
269 HG: Leave message empty to abort commit. |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
270 HG: -- |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
271 HG: user: test |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
272 HG: branch 'tag-and-branch-same-name' |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
273 HG: changed .hgtags |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
274 ==== |
26998
4414d500604f
localrepo: put bookmark move following commit in one transaction
Laurent Charignon <lcharignon@fb.com>
parents:
26485
diff
changeset
|
275 note: commit message saved in .hg/last-message.txt |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
276 transaction abort! |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
277 rollback completed |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
278 abort: pretxncommit.unexpectedabort hook exited with status 1 |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
279 [255] |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
280 $ cat .hg/last-message.txt |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
281 custom tag message |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
282 second line |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
283 |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
284 $ cat >> .hg/hgrc << '__EOF__' |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
285 > [hooks] |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
286 > pretxncommit.unexpectedabort = |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
287 > __EOF__ |
21237
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
288 $ hg status .hgtags |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
289 M .hgtags |
0054a77f49df
localrepo: add "editor" argument to "tag()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20767
diff
changeset
|
290 $ hg revert --no-backup -q .hgtags |
20767
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
291 |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
292 then, test custom commit message itself |
bcfc4f625e57
tag: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19123
diff
changeset
|
293 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
294 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e |
21418
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
295 ==== before editing |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
296 Added tag custom-tag for changeset 75a534207be6 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
297 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
298 |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
299 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
300 HG: Leave message empty to abort commit. |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
301 HG: -- |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
302 HG: user: test |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
303 HG: branch 'tag-and-branch-same-name' |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
304 HG: changed .hgtags |
d4b8fc753455
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21237
diff
changeset
|
305 ==== |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
306 $ hg log -l1 --template "{desc}\n" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
307 custom tag message |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
308 second line |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
309 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
310 |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
311 local tag with .hgtags modified |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
312 |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
313 $ hg tag hgtags-modified |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
314 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13399
diff
changeset
|
315 repository tip rolled back to revision 13 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13399
diff
changeset
|
316 working directory now based on revision 13 |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
317 $ hg st |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
318 M .hgtags |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
319 ? .hgtags.orig |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
320 ? editor.sh |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
321 $ hg tag --local baz |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
322 $ hg revert --no-backup .hgtags |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
323 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
324 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
325 tagging when at named-branch-head that's not a topo-head |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
326 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
327 $ hg up default |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
328 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
329 $ hg merge -t internal:local |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
330 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
331 (branch merge, don't forget to commit) |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
332 $ hg ci -m 'merge named branch' |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
333 $ hg up 13 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
334 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
335 $ hg tag new-topo-head |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
336 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
337 tagging on null rev |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
338 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
339 $ hg up null |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
340 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
341 $ hg tag nullrev |
30247
27addd7e8eca
tag: clarify warning about making a tag on a branch head
Nathan Goldbaum <ngoldbau@illinois.edu>
parents:
26998
diff
changeset
|
342 abort: working directory is not at a branch head (use -f to force) |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
343 [255] |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
344 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
345 $ hg init empty |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
346 $ hg tag -R empty nullrev |
18906
ef7068173a22
tag: clarify cryptic error message when tagging null revision
Mads Kiilerich <madski@unity3d.com>
parents:
17850
diff
changeset
|
347 abort: cannot tag null revision |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
348 [255] |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
349 |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
350 $ hg tag -R empty -r 00000000000 -f nulltag |
18906
ef7068173a22
tag: clarify cryptic error message when tagging null revision
Mads Kiilerich <madski@unity3d.com>
parents:
17850
diff
changeset
|
351 abort: cannot tag null revision |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
352 [255] |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
353 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
354 $ cd .. |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
355 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
356 tagging on an uncommitted merge (issue2542) |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
357 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
358 $ hg init repo-tag-uncommitted-merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
359 $ cd repo-tag-uncommitted-merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
360 $ echo c1 > f1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
361 $ hg ci -Am0 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
362 adding f1 |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
363 $ echo c2 > f2 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
364 $ hg ci -Am1 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
365 adding f2 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
366 $ hg co -q 0 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
367 $ hg branch b1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
368 marked working directory as branch b1 |
15615 | 369 (branches are permanent and global, did you want a bookmark?) |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
370 $ hg ci -m2 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
371 $ hg up default |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
372 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
373 $ hg merge b1 |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
374 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
375 (branch merge, don't forget to commit) |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
376 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
377 $ hg tag t1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
378 abort: uncommitted merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
379 [255] |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
380 $ hg status |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
381 $ hg tag --rev 1 t2 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
382 abort: uncommitted merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
383 [255] |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
384 $ hg tag --rev 1 --local t3 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
385 $ hg tags -v |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
386 tip 2:2a156e8887cc |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
387 t3 1:c3adabd1a5f4 local |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
388 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
389 $ cd .. |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
390 |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
391 commit hook on tag used to be run without write lock - issue3344 |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
392 |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
393 $ hg init repo-tag |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
394 $ touch repo-tag/test |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
395 $ hg -R repo-tag commit -A -m "test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
396 adding test |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
397 $ hg init repo-tag-target |
23951
42f3042cc17f
tests: invoke hg command indirectly from shell script to run on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23139
diff
changeset
|
398 $ cat > "$TESTTMP/issue3344.sh" <<EOF |
42f3042cc17f
tests: invoke hg command indirectly from shell script to run on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23139
diff
changeset
|
399 > hg push "$TESTTMP/repo-tag-target" |
42f3042cc17f
tests: invoke hg command indirectly from shell script to run on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23139
diff
changeset
|
400 > EOF |
42f3042cc17f
tests: invoke hg command indirectly from shell script to run on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23139
diff
changeset
|
401 $ hg -R repo-tag --config hooks.commit="sh ../issue3344.sh" tag tag |
19123
a91894c8064a
check-code: add more path sep glob checks
Matt Mackall <mpm@selenic.com>
parents:
18906
diff
changeset
|
402 pushing to $TESTTMP/repo-tag-target (glob) |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
403 searching for changes |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
404 adding changesets |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
405 adding manifests |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
406 adding file changes |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
407 added 2 changesets with 2 changes to 2 files |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
408 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
409 automatically merge resolvable tag conflicts (i.e. tags that differ in rank) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
410 create two clones with some different tags as well as some common tags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
411 check that we can merge tags that differ in rank |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
412 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
413 $ hg init repo-automatic-tag-merge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
414 $ cd repo-automatic-tag-merge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
415 $ echo c0 > f0 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
416 $ hg ci -A -m0 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
417 adding f0 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
418 $ hg tag tbase |
25688
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
419 $ hg up -qr '.^' |
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
420 $ hg log -r 'wdir()' -T "{latesttagdistance}\n" |
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
421 1 |
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
422 $ hg up -q |
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
423 $ hg log -r 'wdir()' -T "{latesttagdistance}\n" |
24cda1dd45ff
workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents:
23951
diff
changeset
|
424 2 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
425 $ cd .. |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
426 $ hg clone repo-automatic-tag-merge repo-automatic-tag-merge-clone |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
427 updating to branch default |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
428 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
429 $ cd repo-automatic-tag-merge-clone |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
430 $ echo c1 > f1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
431 $ hg ci -A -m1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
432 adding f1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
433 $ hg tag t1 t2 t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
434 $ hg tag --remove t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
435 $ hg tag t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
436 $ echo c2 > f2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
437 $ hg ci -A -m2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
438 adding f2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
439 $ hg tag -f t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
440 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
441 $ cd ../repo-automatic-tag-merge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
442 $ echo c3 > f3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
443 $ hg ci -A -m3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
444 adding f3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
445 $ hg tag -f t4 t5 t6 |
25724
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
446 |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
447 $ hg up -q '.^' |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
448 $ hg log -r 'wdir()' -T "{changessincelatesttag} changes since {latesttag}\n" |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
449 1 changes since t4:t5:t6 |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
450 $ hg log -r '.' -T "{changessincelatesttag} changes since {latesttag}\n" |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
451 0 changes since t4:t5:t6 |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
452 $ echo c5 > f3 |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
453 $ hg log -r 'wdir()' -T "{changessincelatesttag} changes since {latesttag}\n" |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
454 1 changes since t4:t5:t6 |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
455 $ hg up -qC |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
456 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
457 $ hg tag --remove t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
458 $ echo c4 > f4 |
25724
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
459 $ hg log -r '.' -T "{changessincelatesttag} changes since {latesttag}\n" |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
460 2 changes since t4:t6 |
25727
b8245386ab40
templatekw: make {latesttag} a hybrid list
Matt Harbison <matt_harbison@yahoo.com>
parents:
25724
diff
changeset
|
461 $ hg log -r '.' -T "{latesttag % '{latesttag}\n'}" |
b8245386ab40
templatekw: make {latesttag} a hybrid list
Matt Harbison <matt_harbison@yahoo.com>
parents:
25724
diff
changeset
|
462 t4 |
b8245386ab40
templatekw: make {latesttag} a hybrid list
Matt Harbison <matt_harbison@yahoo.com>
parents:
25724
diff
changeset
|
463 t6 |
26485
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
464 $ hg log -r '.' -T "{latesttag('t4') % 'T: {tag}, C: {changes}, D: {distance}\n'}" |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
465 T: t4, C: 2, D: 2 |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
466 $ hg log -r '.' -T "{latesttag('re:\d') % 'T: {tag}, C: {changes}, D: {distance}\n'}" |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
467 T: t4, C: 2, D: 2 |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
468 T: t6, C: 2, D: 2 |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
469 $ hg log -r . -T '{join(latesttag(), "*")}\n' |
43bf9471fae9
templater: introduce {latesttag()} function to match a pattern (issue4184)
Matt Harbison <matt_harbison@yahoo.com>
parents:
25727
diff
changeset
|
470 t4*t6 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
471 $ hg ci -A -m4 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
472 adding f4 |
25724
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
473 $ hg log -r 'wdir()' -T "{changessincelatesttag} changes since {latesttag}\n" |
4474a750413f
templatekw: introduce the changessincelatesttag keyword
Matt Harbison <matt_harbison@yahoo.com>
parents:
25700
diff
changeset
|
474 4 changes since t4:t6 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
475 $ hg tag t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
476 $ hg tag -f t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
477 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
478 $ cd ../repo-automatic-tag-merge-clone |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
479 $ hg pull |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
480 pulling from $TESTTMP/repo-automatic-tag-merge (glob) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
481 searching for changes |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
482 adding changesets |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
483 adding manifests |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
484 adding file changes |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
485 added 6 changesets with 6 changes to 3 files (+1 heads) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
486 (run 'hg heads' to see heads, 'hg merge' to merge) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
487 $ hg merge --tool internal:tagmerge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
488 merging .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
489 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
490 (branch merge, don't forget to commit) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
491 $ hg status |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
492 M .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
493 M f3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
494 M f4 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
495 $ hg resolve -l |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
496 R .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
497 $ cat .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
498 9aa4e1292a27a248f8d07339bed9931d54907be7 t4 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
499 9aa4e1292a27a248f8d07339bed9931d54907be7 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
500 9aa4e1292a27a248f8d07339bed9931d54907be7 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
501 09af2ce14077a94effef208b49a718f4836d4338 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
502 6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
503 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
504 929bca7b18d067cbf3844c3896319a940059d748 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
505 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
506 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
507 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
508 0000000000000000000000000000000000000000 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
509 875517b4806a848f942811a315a5bce30804ae85 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
510 9aa4e1292a27a248f8d07339bed9931d54907be7 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
511 9aa4e1292a27a248f8d07339bed9931d54907be7 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
512 0000000000000000000000000000000000000000 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
513 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
514 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
515 |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
22791
diff
changeset
|
516 check that the merge tried to minimize the diff with the first merge parent |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
517 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
518 $ hg diff --git -r 'p1()' .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
519 diff --git a/.hgtags b/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
520 --- a/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
521 +++ b/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
522 @@ -1,9 +1,17 @@ |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
523 +9aa4e1292a27a248f8d07339bed9931d54907be7 t4 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
524 +9aa4e1292a27a248f8d07339bed9931d54907be7 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
525 +9aa4e1292a27a248f8d07339bed9931d54907be7 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
526 +09af2ce14077a94effef208b49a718f4836d4338 t6 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
527 6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
528 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
529 +929bca7b18d067cbf3844c3896319a940059d748 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
530 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
531 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
532 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
533 0000000000000000000000000000000000000000 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
534 875517b4806a848f942811a315a5bce30804ae85 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
535 +9aa4e1292a27a248f8d07339bed9931d54907be7 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
536 +9aa4e1292a27a248f8d07339bed9931d54907be7 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
537 +0000000000000000000000000000000000000000 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
538 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
539 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
540 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
541 detect merge tag conflicts |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
542 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
543 $ hg update -C -r tip |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
544 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
545 $ hg tag t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
546 $ hg update -C -r 'first(sort(head()))' |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
547 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
548 $ printf "%s %s\n" `hg log -r . --template "{node} t7"` >> .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
549 $ hg commit -m "manually add conflicting t7 tag" |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
550 $ hg merge --tool internal:tagmerge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
551 merging .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
552 automatic .hgtags merge failed |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
553 the following 1 tags are in conflict: t7 |
22707
38e0363dcbe0
filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents:
22680
diff
changeset
|
554 automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice) |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
555 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
556 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
557 [1] |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
558 $ hg resolve -l |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
559 U .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
560 $ cat .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
561 6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
562 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
563 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
564 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
565 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
566 0000000000000000000000000000000000000000 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
567 875517b4806a848f942811a315a5bce30804ae85 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
568 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
569 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
570 ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
571 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
572 $ cd .. |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
573 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
574 handle the loss of tags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
575 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
576 $ hg clone repo-automatic-tag-merge-clone repo-merge-lost-tags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
577 updating to branch default |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
578 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
579 $ cd repo-merge-lost-tags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
580 $ echo c5 > f5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
581 $ hg ci -A -m5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
582 adding f5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
583 $ hg tag -f t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
584 $ hg update -r 'p1(t7)' |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
585 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
586 $ printf '' > .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
587 $ hg commit -m 'delete all tags' |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
588 created new head |
22791
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
589 $ hg log -r 'max(t7::)' |
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
590 changeset: 17:ffe462b50880 |
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
591 user: test |
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
592 date: Thu Jan 01 00:00:00 1970 +0000 |
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
593 summary: Added tag t7 for changeset fd3a9e394ce3 |
a074421fa4e1
addset: use the ascending argument in _iterordered
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22707
diff
changeset
|
594 |
21922
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
595 $ hg update -r 'max(t7::)' |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
596 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
597 $ hg merge -r tip --tool internal:tagmerge |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
598 merging .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
599 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
600 (branch merge, don't forget to commit) |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
601 $ hg resolve -l |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
602 R .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
603 $ cat .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
604 6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
605 0000000000000000000000000000000000000000 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
606 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
607 0000000000000000000000000000000000000000 t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
608 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
609 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
610 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
611 0000000000000000000000000000000000000000 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
612 875517b4806a848f942811a315a5bce30804ae85 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
613 0000000000000000000000000000000000000000 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
614 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
615 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
616 0000000000000000000000000000000000000000 t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
617 ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
618 0000000000000000000000000000000000000000 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
619 ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
620 fd3a9e394ce3afb354a496323bf68ac1755a30de t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
621 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
622 also check that we minimize the diff with the 1st merge parent |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
623 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
624 $ hg diff --git -r 'p1()' .hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
625 diff --git a/.hgtags b/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
626 --- a/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
627 +++ b/.hgtags |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
628 @@ -1,12 +1,17 @@ |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
629 6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
630 +0000000000000000000000000000000000000000 tbase |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
631 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
632 +0000000000000000000000000000000000000000 t1 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
633 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
634 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
635 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
636 0000000000000000000000000000000000000000 t2 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
637 875517b4806a848f942811a315a5bce30804ae85 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
638 +0000000000000000000000000000000000000000 t5 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
639 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
640 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
641 +0000000000000000000000000000000000000000 t3 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
642 ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
643 +0000000000000000000000000000000000000000 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
644 ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
645 fd3a9e394ce3afb354a496323bf68ac1755a30de t7 |
50e20154cb68
filemerge: add internal:tagmerge merge tool
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21418
diff
changeset
|
646 |