mercurial-source: tests/test-tag.t annotate

annotate tests/test-tag.t @ 32775:e6e1884df298

track-tags: write all tag changes to a file The tag changes information we compute is now written to disk. This gives hooks full access to that data. The format picked for that file uses a 2 characters prefix for the action: -R: tag removed +A: tag added -M: tag moved (old value) +M: tag moved (new value) This format allows hooks to easily select the line that matters to them without having to post process the file too much. Here is a couple of examples: * to select all newly tagged changeset, match "^+", * to detect tag move, match "^.M", * to detect tag deletion, match "-R". Once again we rely on the fact the tag tests run through all possible situations to test this change.

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date	Tue, 28 Mar 2017 10:15:02 +0200
parents	fe9c4d614600
children	bca8ad5c1256

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

Mercurial > hg > mercurial-source

annotate tests/test-tag.t @ 32775:e6e1884df298