Mercurial: tests/test-bookmarks.t@0f0cda81e9b0 (annotated)

11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	1	$ hg init
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	3	no bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	4
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	5	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	6	no bookmarks set
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	7
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	8	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	9	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	10	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	11
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	12	bookmark rev -1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	13
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	14	$ hg bookmark X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	15
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	16	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	17
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	18	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	19	* X -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	20
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	21	list bookmarks with color
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	22
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	23	$ hg --config extensions.color= --config color.mode=ansi \
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	24	> bookmarks --color=always
22775 b59c2c8c45df bookmarks: split ui.write() so that it can be easily ported to formatter api Yuya Nishihara <yuya@tcha.org> parents: 22105 diff changeset	25	\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	26
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	27	$ echo a > a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	28	$ hg add a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	29	$ hg commit -m 0
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 7261 diff changeset	30
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	31	bookmark X moved to rev 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	32
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	33	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	34	* X 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	35
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	36	look up bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	37
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	38	$ hg log -r X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	39	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	40	bookmark: X
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	41	tag: tip
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	42	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	43	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	44	summary: 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	45
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	46
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	47	second bookmark for rev 0, command should work even with ui.strict on
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	48
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	49	$ hg --config ui.strict=1 bookmark X2
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	50
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	51	bookmark rev -1 again
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	52
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	53	$ hg bookmark -r null Y
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	54
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	55	list bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	56
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	57	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	58	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	59	* X2 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	60	Y -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	61
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	62	$ echo b > b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	63	$ hg add b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	64	$ hg commit -m 1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	65
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	66	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	67	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	68	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	69	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	70	"bookmark": "X",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	71	"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	72	"rev": 0
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	73	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	74	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	75	"active": true,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	76	"bookmark": "X2",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	77	"node": "925d80f479bb026b0fb3deb27503780b13f74123",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	78	"rev": 1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	79	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	80	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	81	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	82	"bookmark": "Y",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	83	"node": "0000000000000000000000000000000000000000",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	84	"rev": -1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	85	}
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	86	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	87
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	88	bookmarks revset
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	89
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	90	$ hg log -r 'bookmark()'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	91	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	92	bookmark: X
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	93	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	94	date: Thu Jan 01 00:00:00 1970 +0000
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	95	summary: 0
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	96
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	97	changeset: 1:925d80f479bb
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	98	bookmark: X2
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	99	tag: tip
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	100	user: test
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	101	date: Thu Jan 01 00:00:00 1970 +0000
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	102	summary: 1
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	103
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	104	$ hg log -r 'bookmark(Y)'
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	105	$ hg log -r 'bookmark(X2)'
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	106	changeset: 1:925d80f479bb
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	107	bookmark: X2
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	108	tag: tip
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	109	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	110	date: Thu Jan 01 00:00:00 1970 +0000
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	111	summary: 1
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	112
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	113	$ hg log -r 'bookmark("re:X")'
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	114	changeset: 0:f7b1eb17ad24
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	115	bookmark: X
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	116	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	117	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	118	summary: 0
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	119
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	120	changeset: 1:925d80f479bb
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	121	bookmark: X2
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	122	tag: tip
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	123	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	124	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	125	summary: 1
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	126
22105 3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	127	$ hg log -r 'bookmark("literal:X")'
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	128	changeset: 0:f7b1eb17ad24
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	129	bookmark: X
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	130	user: test
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	131	date: Thu Jan 01 00:00:00 1970 +0000
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	132	summary: 0
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	133
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	134
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	135	$ hg log -r 'bookmark(unknown)'
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	136	abort: bookmark 'unknown' does not exist!
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	137	[255]
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	138	$ hg log -r 'bookmark("re:unknown")'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	139	abort: no bookmarks exist that match 'unknown'!
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	140	[255]
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	141	$ hg log -r 'present(bookmark("literal:unknown"))'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	142	$ hg log -r 'present(bookmark("re:unknown"))'
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	143
12822 f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	144	$ hg help revsets \| grep 'bookmark('
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	145	"bookmark([name])"
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	146
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	147	bookmarks X and X2 moved to rev 1, Y at rev -1
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	148
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	149	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	150	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	151	* X2 1:925d80f479bb
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	152	Y -1:000000000000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	153
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	154	bookmark rev 0 again
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	155
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	156	$ hg bookmark -r 0 Z
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	157
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	158	$ hg update X
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	159	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	160	(activating bookmark X)
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	161	$ echo c > c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	162	$ hg add c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	163	$ hg commit -m 2
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	164	created new head
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	165
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	166	bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	167
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	168	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	169	* X 2:db815d6d32e6
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	170	X2 1:925d80f479bb
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13386 diff changeset	171	Y -1:000000000000
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	172	Z 0:f7b1eb17ad24
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	173
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	174	rename nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	175
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	176	$ hg bookmark -m A B
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	177	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	178	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	179
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	180	rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	181
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	182	$ hg bookmark -m X Y
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	183	abort: bookmark 'Y' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	184	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	185
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	186	force rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	187
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	188	$ hg bookmark -f -m X Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	189
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	190	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	191
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	192	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	193	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	194	* Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	195	Z 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	196
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	197	bookmarks from a revset
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	198	$ hg bookmark -r '.^1' REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	199	$ hg bookmark -r ':tip' TIP
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	200	$ hg up -q TIP
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	201	$ hg bookmarks
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	202	REVSET 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	203	* TIP 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	204	X2 1:925d80f479bb
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	205	Y 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	206	Z 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	207
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	208	$ hg bookmark -d REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	209	$ hg bookmark -d TIP
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	210
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	211	rename without new name or multiple names
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	212
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	213	$ hg bookmark -m Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	214	abort: new bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	215	[255]
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	216	$ hg bookmark -m Y Y2 Y3
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	217	abort: only one new bookmark name allowed
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	218	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	219
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	220	delete without name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	221
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	222	$ hg bookmark -d
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	223	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	224	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	225
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	226	delete nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	227
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	228	$ hg bookmark -d A
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	229	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	230	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	231
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	232	bookmark name with spaces should be stripped
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	233
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	234	$ hg bookmark ' x y '
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	235
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	236	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	237
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	238	$ hg bookmarks
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	239	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	240	Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	241	Z 0:f7b1eb17ad24
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	242	* x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	243
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	244	look up stripped bookmark name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	245
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	246	$ hg log -r '"x y"'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	247	changeset: 2:db815d6d32e6
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	248	bookmark: Y
f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	249	bookmark: x y
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	250	tag: tip
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	251	parent: 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	252	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	253	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	254	summary: 2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	255
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	256
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	257	reject bookmark name with newline
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	258
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	259	$ hg bookmark '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	260	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	261	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	262	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	263
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	264	$ hg bookmark -m Z '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	265	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	266	abort: bookmark names cannot consist entirely of whitespace
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	267	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	268
17816 19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	269	bookmark with reserved name
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	270
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	271	$ hg bookmark tip
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	272	abort: the name 'tip' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	273	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	274
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	275	$ hg bookmark .
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	276	abort: the name '.' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	277	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	278
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	279	$ hg bookmark null
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	280	abort: the name 'null' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	281	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	282
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	283
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	284	bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	285
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	286	$ hg bookmark X2
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	287	abort: bookmark 'X2' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	288	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	289
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	290	$ hg bookmark -m Y Z
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	291	abort: bookmark 'Z' already exists (use -f to force)
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	292	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	293
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	294	bookmark with name of branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	295
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	296	$ hg bookmark default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	297	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	298	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	299
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	300	$ hg bookmark -m Y default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	301	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	302	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	303
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	304	bookmark with integer name
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	305
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	306	$ hg bookmark 10
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18782 diff changeset	307	abort: cannot use an integer as a name
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	308	[255]
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	309
17790 0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	310	incompatible options
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	311
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	312	$ hg bookmark -m Y -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	313	abort: --delete and --rename are incompatible
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	314	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	315
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	316	$ hg bookmark -r 1 -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	317	abort: --rev is incompatible with --delete
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	318	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	319
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	320	$ hg bookmark -r 1 -m Z Y
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	321	abort: --rev is incompatible with --rename
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	322	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	323
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	324	force bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	325
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	326	$ hg bookmark -f X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	327
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	328	force bookmark back to where it was, should deactivate it
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	329
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	330	$ hg bookmark -fr1 X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	331	$ hg bookmarks
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	332	X2 1:925d80f479bb
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	333	Y 2:db815d6d32e6
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	334	Z 0:f7b1eb17ad24
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	335	x y 2:db815d6d32e6
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	336
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	337	forward bookmark to descendant without --force
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	338
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	339	$ hg bookmark Z
18774 b616c9b8001d bookmarks: fix test broken by 0bba1ff2ac7b Kevin Bullock <kbullock@ringworld.org> parents: 18773 diff changeset	340	moving bookmark 'Z' forward from f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	341
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	342	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	343
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	344	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	345	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	346	Y 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	347	* Z 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	348	x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	349
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	350	revision but no bookmark name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	351
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	352	$ hg bookmark -r .
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	353	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	354	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	355
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	356	bookmark name with whitespace only
11704 18c47562d331 bookmarks: don't allow name to contain whitespaces only Idan Kamara <idankk86@gmail.com> parents: 11282 diff changeset	357
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	358	$ hg bookmark ' '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	359	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	360	[255]
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	361
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	362	$ hg bookmark -m Y ' '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	363	abort: bookmark names cannot consist entirely of whitespace
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	364	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	365
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	366	invalid bookmark
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	367
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	368	$ hg bookmark 'foo:bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	369	abort: ':' cannot be used in a name
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	370	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	371
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	372	$ hg bookmark 'foo
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	373	> bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	374	abort: '\n' cannot be used in a name
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	375	[255]
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	376
13474 6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	377	the bookmark extension should be ignored now that it is part of core
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	378
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	379	$ echo "[extensions]" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	380	$ echo "bookmarks=" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	381	$ hg bookmarks
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	382	X2 1:925d80f479bb
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	383	Y 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	384	* Z 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	385	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	386
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	387	test summary
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	388
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	389	$ hg summary
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	390	parent: 2:db815d6d32e6 tip
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	391	2
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	392	branch: default
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	393	bookmarks: *Z Y x y
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	394	commit: (clean)
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	395	update: 1 new changesets, 2 branch heads (merge)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	396	phases: 3 draft
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	397
13477 0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	398	test id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	399
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	400	$ hg id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	401	db815d6d32e6 tip Y/Z/x y
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	402
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	403	test rollback
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	404
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	405	$ echo foo > f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	406	$ hg bookmark tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	407	$ hg ci -Amr
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	408	adding f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	409	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	410	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	411	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	412	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	413	* tmp-rollback 3:2bf5cfec5864
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	414	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	415	$ hg rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	416	repository tip rolled back to revision 2 (undo commit)
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	417	working directory now based on revision 2
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	418	$ hg bookmarks
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	419	X2 1:925d80f479bb
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	420	Y 2:db815d6d32e6
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	421	Z 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	422	* tmp-rollback 2:db815d6d32e6
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	423	x y 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	424	$ hg bookmark -f Z -r 1
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	425	$ hg rollback
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	426	repository tip rolled back to revision 2 (undo bookmark)
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	427	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	428	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	429	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	430	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	431	* tmp-rollback 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	432	x y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	433	$ hg bookmark -d tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	434
18781 99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	435	activate bookmark on working dir parent without --force
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	436
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	437	$ hg bookmark --inactive Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	438	$ hg bookmark Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	439
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	440	test clone
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	441
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	442	$ hg bookmark -r 2 -i @
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	443	$ hg bookmark -r 2 -i a@
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	444	$ hg bookmarks
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	445	@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	446	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	447	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	448	* Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	449	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	450	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	451	$ hg clone . cloned-bookmarks
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	452	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	453	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	454	$ hg -R cloned-bookmarks bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	455	* @ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	456	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	457	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	458	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	459	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	460	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	461
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	462	test clone with pull protocol
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	463
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	464	$ hg clone --pull . cloned-bookmarks-pull
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	465	requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	466	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	467	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	468	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	469	added 3 changesets with 3 changes to 3 files (+1 heads)
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	470	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	471	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	472	$ hg -R cloned-bookmarks-pull bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	473	* @ 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	474	X2 1:925d80f479bb
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	475	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	476	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	477	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	478	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	479
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	480	delete multiple bookmarks at once
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	481
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	482	$ hg bookmark -d @ a@
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	483
17868 04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	484	test clone with a bookmark named "default" (issue3677)
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	485
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	486	$ hg bookmark -r 1 -f -i default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	487	$ hg clone . cloned-bookmark-default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	488	updating to branch default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	489	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	490	$ hg -R cloned-bookmark-default bookmarks
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	491	X2 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	492	Y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	493	Z 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	494	default 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	495	x y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	496	$ hg -R cloned-bookmark-default parents -q
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	497	2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	498	$ hg bookmark -d default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	499
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	500	test clone with a specific revision
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	501
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	502	$ hg clone -r 925d80 . cloned-bookmarks-rev
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	503	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	504	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	505	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	506	added 2 changesets with 2 changes to 2 files
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	507	updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	508	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	509	$ hg -R cloned-bookmarks-rev bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	510	X2 1:925d80f479bb
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	511
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	512	test clone with update to a bookmark
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	513
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	514	$ hg clone -u Z . ../cloned-bookmarks-update
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	515	updating to branch default
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	516	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	517	$ hg -R ../cloned-bookmarks-update bookmarks
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	518	X2 1:925d80f479bb
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	519	Y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	520	* Z 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	521	x y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	522
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	523	create bundle with two heads
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	524
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	525	$ hg clone . tobundle
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	526	updating to branch default
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	527	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	528	$ echo x > tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	529	$ hg -R tobundle add tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	530	$ hg -R tobundle commit -m'x'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	531	$ hg -R tobundle update -r -2
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	532	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	533	$ echo y > tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	534	$ hg -R tobundle branch test
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	535	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14906 diff changeset	536	(branches are permanent and global, did you want a bookmark?)
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	537	$ hg -R tobundle add tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	538	$ hg -R tobundle commit -m'y'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	539	$ hg -R tobundle bundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	540	searching for changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	541	2 changesets found
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	542	$ hg unbundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	543	adding changesets
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	544	adding manifests
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	545	adding file changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	546	added 2 changesets with 2 changes to 2 files (+1 heads)
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	547	(run 'hg heads' to see heads, 'hg merge' to merge)
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	548
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 25111 diff changeset	549	update to active bookmark if it's not the parent
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	550
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	551	$ hg summary
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	552	parent: 2:db815d6d32e6
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	553	2
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	554	branch: default
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	555	bookmarks: *Z Y x y
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	556	commit: 1 added, 1 unknown (new branch head)
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	557	update: 2 new changesets (update)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	558	phases: 5 draft
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	559	$ hg update
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	560	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	561	updating bookmark Z
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	562	$ hg bookmarks
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	563	X2 1:925d80f479bb
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	564	Y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	565	* Z 3:125c9a1d6df6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	566	x y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	567
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	568	pull --update works the same as pull && update
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	569
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	570	$ hg bookmark -r3 Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	571	moving bookmark 'Y' forward from db815d6d32e6
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	572	$ cp -r ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	573
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	574	(manual version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	575
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	576	$ hg -R ../cloned-bookmarks-manual-update update Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	577	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	578	(activating bookmark Y)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	579	$ hg -R ../cloned-bookmarks-manual-update pull .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	580	pulling from .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	581	searching for changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	582	adding changesets
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	583	adding manifests
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	584	adding file changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	585	added 2 changesets with 2 changes to 2 files (+1 heads)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	586	updating bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	587	updating bookmark Z
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	588	(run 'hg heads' to see heads, 'hg merge' to merge)
26286 4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	589
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	590	(# tests strange but with --date crashing when bookmark have to move)
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	591
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	592	$ hg -R ../cloned-bookmarks-manual-update update -d 1986
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	593	abort: revision matching date not found
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	594	[255]
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	595	$ hg -R ../cloned-bookmarks-manual-update update
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	596	updating to active bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	597	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	598	(activating bookmark Y)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	599
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	600	(all in one version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	601
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	602	$ hg -R ../cloned-bookmarks-update update Y
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	603	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	604	(activating bookmark Y)
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	605	$ hg -R ../cloned-bookmarks-update pull --update .
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	606	pulling from .
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	607	searching for changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	608	adding changesets
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	609	adding manifests
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	610	adding file changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	611	added 2 changesets with 2 changes to 2 files (+1 heads)
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	612	updating bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	613	updating bookmark Z
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	614	updating to active bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	615	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	616
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	617	test wrongly formated bookmark
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	618
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	619	$ echo '' >> .hg/bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	620	$ hg bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	621	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	622	Y 3:125c9a1d6df6
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	623	* Z 3:125c9a1d6df6
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	624	x y 2:db815d6d32e6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	625	$ echo "Ican'thasformatedlines" >> .hg/bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	626	$ hg bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	627	malformed line in .hg/bookmarks: "Ican'thasformatedlines"
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	628	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	629	Y 3:125c9a1d6df6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	630	* Z 3:125c9a1d6df6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	631	x y 2:db815d6d32e6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	632
16573 5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	633	test missing revisions
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	634
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	635	$ echo "925d80f479bc z" > .hg/bookmarks
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	636	$ hg book
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	637	no bookmarks set
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	638
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	639	test stripping a non-checked-out but bookmarked revision
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	640
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	641	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	642	o changeset: 4:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	643	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	644	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	645	\| parent: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	646	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	647	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	648	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	649	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	650	\| @ changeset: 3:125c9a1d6df6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	651	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	652	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	653	\| summary: x
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	654	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	655	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	656	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	657	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	658	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	659	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	660	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	661	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	662	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	663	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	664	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	665	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	666	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	667	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	668	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	669	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	670
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	671	$ hg book should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	672	$ hg co --clean 4
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	673	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
21404 ca275f7ec576 update: when deactivating a bookmark, print a message Siddharth Agarwal <sid0@fb.com> parents: 20117 diff changeset	674	(leaving bookmark should-end-on-two)
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	675	$ hg book four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	676	$ hg --config extensions.mq= strip 3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	677	saved backup bundle to * (glob)
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	678	should-end-on-two should end up pointing to revision 2, as that's the
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	679	tipmost surviving ancestor of the stripped revision.
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	680	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	681	@ changeset: 3:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	682	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	683	\| bookmark: four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	684	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	685	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	686	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	687	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	688	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	689	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	690	\| bookmark: should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	691	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	692	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	693	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	694	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	695	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	696	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	697	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	698	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	699	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	700	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	701	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	702	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	703	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	704	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	705
25789 95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	706	test non-linear update not clearing active bookmark
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	707
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	708	$ hg up 1
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	709	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	710	(leaving bookmark four)
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	711	$ hg book drop
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	712	$ hg up -C
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	713	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	714	(leaving bookmark drop)
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	715	$ hg sum
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	716	parent: 2:db815d6d32e6
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	717	2
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	718	branch: default
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	719	bookmarks: should-end-on-two
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	720	commit: 2 unknown (clean)
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	721	update: 1 new changesets, 2 branch heads (merge)
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	722	phases: 4 draft
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	723	$ hg book
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	724	drop 1:925d80f479bb
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	725	four 3:9ba5f110a0b3
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	726	should-end-on-two 2:db815d6d32e6
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	727	$ hg book -d drop
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	728	$ hg up four
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	729	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
95dc4b009f60 bookmarks: clear active bookmark on non-linear update Matt Mackall <mpm@selenic.com> parents: 25744 diff changeset	730	(activating bookmark four)
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	731
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	732	test clearing divergent bookmarks of linear ancestors
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	733
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	734	$ hg bookmark Z -r 0
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	735	$ hg bookmark Z@1 -r 1
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	736	$ hg bookmark Z@2 -r 2
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	737	$ hg bookmark Z@3 -r 3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	738	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	739	Z 0:f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	740	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	741	Z@2 2:db815d6d32e6
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	742	Z@3 3:9ba5f110a0b3
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	743	* four 3:9ba5f110a0b3
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	744	should-end-on-two 2:db815d6d32e6
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	745	$ hg bookmark Z
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	746	moving bookmark 'Z' forward from f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	747	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	748	* Z 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	749	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	750	four 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	751	should-end-on-two 2:db815d6d32e6
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	752
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	753	test clearing only a single divergent bookmark across branches
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	754
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	755	$ hg book foo -r 1
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	756	$ hg book foo@1 -r 0
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	757	$ hg book foo@2 -r 2
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	758	$ hg book foo@3 -r 3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	759	$ hg book foo -r foo@3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	760	$ hg book
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	761	* Z 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	762	Z@1 1:925d80f479bb
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	763	foo 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	764	foo@1 0:f7b1eb17ad24
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	765	foo@2 2:db815d6d32e6
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	766	four 3:9ba5f110a0b3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	767	should-end-on-two 2:db815d6d32e6

author	Anton Shestakov <av6@dwimlabs.net>
	Sat, 26 Sep 2015 17:15:58 +0800
changeset 26390	0f0cda81e9b0
parent 26286	4b685712fa45
child 26538	5c9ec1cc671a
permissions	-rw-r--r--