Mercurial > hg
annotate tests/test-tag.t @ 20444:1478a9ce6790
run-tests: fix typo and print out failing line
Instead of stripping the newline and printing the line, only the newline was
printed.
The output on buildbot will make more sense now.
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Tue, 11 Feb 2014 01:15:07 +0100 |
parents | a91894c8064a |
children | bcfc4f625e57 |
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 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
19 $ hg tag "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
20 $ hg history |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
21 changeset: 1:d4f0d2909abc |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
22 tag: tip |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
23 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
24 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
25 summary: Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
26 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
27 changeset: 0:acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
28 tag: bleah |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
29 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
30 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
|
31 summary: test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
32 |
11692
52e4ac3e63f7
tag: do not allow tag names to consist solely of whitespace (issue2307)
Benjamin Pollack <benjamin@bitquabit.com>
parents:
11185
diff
changeset
|
33 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
34 $ echo foo >> .hgtags |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
35 $ hg tag "bleah2" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
36 abort: working copy of .hgtags is changed (please commit .hgtags manually) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
37 [255] |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
38 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
39 $ hg revert .hgtags |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
40 $ 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
|
41 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
|
42 [255] |
17813
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
43 $ hg tag tap nada dot tip |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
44 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
|
45 [255] |
17813
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
46 $ hg tag . |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
47 abort: the name '.' is reserved |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
48 [255] |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
49 $ hg tag null |
813db1dccc05
test-tag: test that all reserved names are rejected
Kevin Bullock <kbullock@ringworld.org>
parents:
17260
diff
changeset
|
50 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
|
51 [255] |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
52 $ hg tag "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
53 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
|
54 [255] |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
55 $ hg tag "blecch" "bleah" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
56 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
|
57 [255] |
6321
55ba3bc5b8fd
tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents:
4933
diff
changeset
|
58 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
59 $ hg tag --remove "blecch" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
60 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
|
61 [255] |
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
62 $ hg tag --remove "bleah" "blecch" "blough" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
63 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
|
64 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
65 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
66 $ hg tag -r 0 "bleah0" |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
67 $ hg tag -l -r 1 "bleah1" |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
68 $ hg tag gack gawk gorp |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
69 $ hg tag -f gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
70 $ 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
|
71 |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
72 $ hg tag "bleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
73 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
74 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
75 $ hg tag " bleah" |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
76 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
77 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
78 $ hg tag " bleah" |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
79 abort: tag 'bleah' already exists (use -f to force) |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
80 [255] |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
81 $ hg tag -r 0 " bleahbleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
82 $ hg tag -r 0 " bleah bleah " |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
83 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
84 $ cat .hgtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
85 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
86 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
87 336fccc858a4eb69609a291105009e484a6b6b8d gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
88 336fccc858a4eb69609a291105009e484a6b6b8d gawk |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
89 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
90 336fccc858a4eb69609a291105009e484a6b6b8d gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
91 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
92 799667b6f2d9b957f73fa644a918c2df22bab58f gack |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
93 0000000000000000000000000000000000000000 gack |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
94 336fccc858a4eb69609a291105009e484a6b6b8d gorp |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
95 0000000000000000000000000000000000000000 gorp |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
96 acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
97 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah |
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
98 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
99 $ cat .hg/localtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
100 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
101 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
102 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
|
103 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
104 $ hg update 0 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
105 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
|
106 $ hg tag -l localblah |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
107 $ hg tag "foobar" |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
108 abort: not at a branch head (use -f to force) |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
109 [255] |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
110 $ hg tag -f "foobar" |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
111 $ cat .hgtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
112 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
113 $ cat .hg/localtags |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
114 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
115 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
116 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
117 $ hg tag -l 'xx |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
118 > newline' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17813
diff
changeset
|
119 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
|
120 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
121 $ 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
|
122 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
|
123 [255] |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
124 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
125 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
|
126 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
127 $ cd .. |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
128 $ hg -R test log -r0:5 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
129 changeset: 0:acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
130 tag: bleah |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
131 tag: bleah bleah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
132 tag: bleah0 |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
133 tag: bleahbleah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
134 tag: foobar |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
135 tag: localblah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
136 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
137 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
|
138 summary: test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
139 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
140 changeset: 1:d4f0d2909abc |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
141 tag: bleah1 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
142 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
143 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
144 summary: Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
145 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
146 changeset: 2:336fccc858a4 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
147 tag: gawk |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
148 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
149 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
150 summary: Added tag bleah0 for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
151 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
152 changeset: 3:799667b6f2d9 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
153 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
154 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
155 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
|
156 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
157 changeset: 4:154eeb7c0138 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
158 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
159 date: Thu Jan 01 00:00:00 1970 +0000 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
160 summary: Added tag gack for changeset 799667b6f2d9 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
161 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
162 changeset: 5:b4bb47aaff09 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
163 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
164 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
|
165 summary: Removed tag gack, gorp |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
166 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
167 $ hg clone -q -rbleah1 test test1 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
168 $ hg -R test1 parents --style=compact |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
169 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
|
170 Added tag bleah for changeset acb14030fe0a |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
171 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
172 $ hg clone -q -r5 test#bleah1 test2 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
173 $ hg -R test2 parents --style=compact |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
174 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
|
175 Removed tag gack, gorp |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
176 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
177 $ hg clone -q -U test#bleah1 test3 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
178 $ 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
|
179 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
180 $ cd test |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
181 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
182 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
|
183 doesn't end with EOL |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
184 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
185 $ python << EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
186 > 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
|
187 > 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
|
188 > EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
189 $ cat .hg/localtags; echo |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
190 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
191 $ hg tag -l localnewline |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
192 $ cat .hg/localtags; echo |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
193 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
194 c2899151f4e76890c602a2597a650a72666681bf localnewline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
195 |
11063
eb23c876c111
tag: warn users about tag/branch possible name conflicts
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8417
diff
changeset
|
196 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
197 $ python << EOF |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
198 > 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
|
199 > f = file('.hgtags', 'w'); f.write(last); f.close() |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
200 > EOF |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
201 $ hg ci -m'broken manual edit of .hgtags' |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
202 $ cat .hgtags; echo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
203 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
204 $ hg tag newline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
205 $ cat .hgtags; echo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
206 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11788
diff
changeset
|
207 a0eea09de1eeec777b46f2085260a373b2fbc293 newline |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
208 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
209 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
210 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
|
211 |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
212 $ hg branch tag-and-branch-same-name |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
213 marked working directory as branch tag-and-branch-same-name |
15615 | 214 (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
|
215 $ hg ci -m"discouraged" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
216 $ hg tag tag-and-branch-same-name |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
217 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
|
218 |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
219 test custom commit messages |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
220 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
221 $ cat > editor.sh << '__EOF__' |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
222 > echo "custom tag message" > "$1" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
223 > echo "second line" >> "$1" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
224 > __EOF__ |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
225 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e |
11788
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
226 $ hg log -l1 --template "{desc}\n" |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
227 custom tag message |
b3de1438028d
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11692
diff
changeset
|
228 second line |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
229 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
230 |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
231 local tag with .hgtags modified |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
232 |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
233 $ hg tag hgtags-modified |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
234 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13399
diff
changeset
|
235 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
|
236 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
|
237 $ hg st |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
238 M .hgtags |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
239 ? .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
|
240 ? editor.sh |
13133
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
241 $ hg tag --local baz |
c1492615cdee
tag: don't check .hgtags status if --local passed
Kevin Bullock <kbullock@ringworld.org>
parents:
12642
diff
changeset
|
242 $ 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
|
243 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
244 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
245 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
|
246 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
247 $ hg up default |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
248 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
|
249 $ hg merge -t internal:local |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
250 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
|
251 (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
|
252 $ hg ci -m 'merge named branch' |
13399
eff102facb15
tag: add tests for tags with whitespace (issue2174)
Afuna
parents:
13159
diff
changeset
|
253 $ hg up 13 |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
254 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
|
255 $ hg tag new-topo-head |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
256 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
257 tagging on null rev |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
258 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
259 $ hg up null |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
260 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
|
261 $ hg tag nullrev |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
262 abort: not at a branch head (use -f to force) |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
263 [255] |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
264 |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
265 $ hg init empty |
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
266 $ 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
|
267 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
|
268 [255] |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
269 |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
270 $ 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
|
271 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
|
272 [255] |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
13134
diff
changeset
|
273 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
274 $ cd .. |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
275 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
276 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
|
277 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
278 $ 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
|
279 $ cd repo-tag-uncommitted-merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
280 $ echo c1 > f1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
281 $ hg ci -Am0 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
282 adding f1 |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
283 $ echo c2 > f2 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
284 $ hg ci -Am1 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
285 adding f2 |
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
286 $ hg co -q 0 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
287 $ hg branch b1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
288 marked working directory as branch b1 |
15615 | 289 (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
|
290 $ hg ci -m2 |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
291 $ hg up default |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
292 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
|
293 $ hg merge b1 |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
294 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
|
295 (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
|
296 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
297 $ hg tag t1 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
298 abort: uncommitted merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
299 [255] |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
300 $ hg status |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
301 $ hg tag --rev 1 t2 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
302 abort: uncommitted merge |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
303 [255] |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
304 $ 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
|
305 $ 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
|
306 tip 2:2a156e8887cc |
13159
3172da69ff37
tests: eliminate fast-forward merge in test-tag
Matt Mackall <mpm@selenic.com>
parents:
13135
diff
changeset
|
307 t3 1:c3adabd1a5f4 local |
13134
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
308 |
ea3c93b53fdb
tag: fix uncommitted merge check and error message (issue2542)
Kevin Bullock <kbullock@ringworld.org>
parents:
13133
diff
changeset
|
309 $ cd .. |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
310 |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
311 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
|
312 |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
313 $ hg init repo-tag |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
314 $ touch repo-tag/test |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
315 $ 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
|
316 adding test |
16680
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
317 $ hg init repo-tag-target |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16680
diff
changeset
|
318 $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag |
19123
a91894c8064a
check-code: add more path sep glob checks
Matt Mackall <mpm@selenic.com>
parents:
18906
diff
changeset
|
319 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
|
320 searching for changes |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
321 adding changesets |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
322 adding manifests |
d0e419b0f7de
tag: run commit hook when lock is released (issue3344)
Mads Kiilerich <mads@kiilerich.com>
parents:
15623
diff
changeset
|
323 adding file changes |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
16901
diff
changeset
|
324 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
|
325 |