mercurial: tests/test-bookmarks-strip.t@71a96f6c205d (annotated)

11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	1	$ echo "[extensions]" >> $HGRCPATH
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	2	$ echo "mq=" >> $HGRCPATH
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	3
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	4	$ hg init
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	5
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	6	$ echo qqq>qqq.txt
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	7
13307 7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	8	rollback dry run without rollback information
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	9
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	10	$ hg rollback
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	11	no rollback information available
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	12	[1]
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	13
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	14	add file
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	15
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	16	$ hg add
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	17	adding qqq.txt
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	18
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	19	commit first revision
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	20
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	21	$ hg ci -m 1
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	22
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	23	set bookmark
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	24
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	25	$ hg book test
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	26
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	27	$ echo www>>qqq.txt
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	28
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	29	commit second revision
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	30
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	31	$ hg ci -m 2
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	32
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	33	set bookmark
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	34
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	35	$ hg book test2
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	36
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	37	update to -2
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	38
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	39	$ hg update -r -2
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	40	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	41
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	42	$ echo eee>>qqq.txt
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	43
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	44	commit new head
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	45
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	46	$ hg ci -m 3
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	47	created new head
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	48
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	49	bookmarks updated?
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	50
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	51	$ hg book
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	52	test 1:25e1ee7a0081
4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	53	test2 1:25e1ee7a0081
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	54
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	55	strip to revision 1
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	56
11907 863567a1364f tests: use regular expressions instead of helpers Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11864 diff changeset	57	$ hg strip 1
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12394 diff changeset	58	saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	59
b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	60	list bookmarks
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	61
11864 b2a06ef53b7b tests: unify test-bookmarks-strip Martin Geisler <mg@lazybytes.net> parents: 11208 diff changeset	62	$ hg book
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13356 diff changeset	63	test 1:8cf31af87a2b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11907 diff changeset	64	* test2 1:8cf31af87a2b
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	65
12394 9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	66	immediate rollback and reentrancy issue
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	67
12394 9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	68	$ echo "mq=!" >> $HGRCPATH
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	69	$ hg init repo
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	70	$ cd repo
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	71	$ echo a > a
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	72	$ hg ci -Am adda
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	73	adding a
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	74	$ echo b > b
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	75	$ hg ci -Am addb
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	76	adding b
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	77	$ hg bookmarks markb
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	78	$ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 13416 diff changeset	79	repository tip rolled back to revision 0 (undo commit)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 13416 diff changeset	80	working directory now based on revision 0
7316 9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup David Soria Parra <dsp@php.net> parents: diff changeset	81
12394 9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	82	are you there?
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	83
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	84	$ hg bookmarks
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	85	no bookmarks set
12392 741290486877 bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) Patrick Mezard <pmezard@gmail.com> parents: 11208 diff changeset	86
13627 71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	87	can we commit? (issue2692)
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	88
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	89	$ echo c > c
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	90	$ hg ci -Am rockon
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	91	adding c
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	92
12394 9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	93	can you be added again?
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	94
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	95	$ hg bookmarks markb
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	96	$ hg bookmarks
13627 71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	97	* markb 1:fdb34407462c
13307 7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	98
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	99	rollback dry run with rollback information
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	100
7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	101	$ hg rollback -n
13627 71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	102	repository tip rolled back to revision 0 (undo commit)
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	103	$ hg bookmarks
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	104	* markb 1:fdb34407462c
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	105
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	106	rollback dry run with rollback information and no commit undo
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	107
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	108	$ rm .hg/store/undo
71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	109	$ hg rollback -n
13356 d96db730fcb2 bookmarks: merge rollback support into localrepo Matt Mackall <mpm@selenic.com> parents: 13307 diff changeset	110	no rollback information available
d96db730fcb2 bookmarks: merge rollback support into localrepo Matt Mackall <mpm@selenic.com> parents: 13307 diff changeset	111	[1]
13307 7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	112	$ hg bookmarks
13627 71a96f6c205d bookmarks: discard current bookmark if absent from the bookmarks (issue2692) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	113	* markb 1:fdb34407462c
13307 7f2b8aac7bdc bookmarks: respect rollbacks dryrun parameter David Soria Parra <dsp@php.net> parents: 12640 diff changeset	114
12394 9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	115	$ cd ..
9d45f78c465b Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12392 12376 diff changeset	116

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
	Sun, 13 Mar 2011 14:36:47 +0100
branch	stable
changeset 13627	71a96f6c205d
parent 13469	07a6460f829a
child 16191	7c75924a6926
permissions	-rw-r--r--