Mercurial: tests/test-obshistory.t@17a744c5e270 (annotated)

35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	1	This test file test the various messages when accessing obsolete
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	2	revisions.
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	3
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	4	Global setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	5	============
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	6
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	7	$ . $TESTDIR/testlib/obsmarker-common.sh
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	8	$ cat >> $HGRCPATH <<EOF
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	9	> [ui]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	10	> interactive = true
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	11	> [phases]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	12	> publish=False
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	> [experimental]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	14	> evolution.createmarkers = yes
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	15	> evolution.effect-flags = yes
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	16	> EOF
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	17
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	18	Test output on amended commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	19	=============================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	20
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	21	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	23
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	24	$ hg init $TESTTMP/local-amend
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	$ cd $TESTTMP/local-amend
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	26	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	$ mkcommit A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	$ echo 42 >> A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	$ hg commit --amend -m "A1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	>
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	> Better commit message"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	@ changeset: 2:4ae3a4151de9
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	34	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	38	\| summary: A1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	\| x changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	41	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	42	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	43	\| obsolete: rewritten using amend as 2:4ae3a4151de9
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	44	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	45	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	46	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	50
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	$ hg update 471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	56	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	$ hg update --hidden "desc(A0)"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	updating to a hidden changeset 471f378eab4c
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	59	(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	61
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	Test output with pruned commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	==============================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	64
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	67
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	$ hg init $TESTTMP/local-prune
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	$ cd $TESTTMP/local-prune
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	70	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	71	$ mkcommit A0 # 0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	72	$ mkcommit B0 # 1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	73	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	74	@ changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	75	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	76	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	77	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	78	\| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	79	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	80	o changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	81	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	82	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	83	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	84	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	85	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	86	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	87	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	88	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	89
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	90	$ hg debugobsolete --record-parents `getid 'desc(B0)'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	91	obsoleted 1 changesets
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	92
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	93	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	94	@ changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	95	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	96	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	97	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	98	\| obsolete: pruned
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	99	\| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	100	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	101	o changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	102	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	103	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	104	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	105	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	106	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	107	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	108	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	109	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	110
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	111
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	112	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	113	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	114	$ hg up 1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	115	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	116	$ hg up 0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	117	abort: hidden revision '0dec01379d3b' is pruned!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	118	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	119	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	120	$ hg up --hidden -r 'desc(B0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	121	updating to a hidden changeset 0dec01379d3b
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	122	(hidden revision '0dec01379d3b' is pruned)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	123	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	124
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	125	Test output with splitted commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	126	================================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	127
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	128	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	129	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	130
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	131	$ hg init $TESTTMP/local-split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	132	$ cd $TESTTMP/local-split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	133	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	134	$ echo 42 >> a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	135	$ echo 43 >> b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	136	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	137	adding a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	138	adding b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	139	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	140	@ changeset: 1:471597cad322
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	141	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	142	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	143	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	144	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	145	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	146	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	147	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	148	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	149	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	150
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	151	# Simulate a split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	152	$ hg up 0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	153	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	154
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	155	$ echo 42 >> a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	156	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	157	adding a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	158	created new head
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	159
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	160	$ echo 43 >> b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	161	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	162	adding b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	163
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	164	$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	165	obsoleted 1 changesets
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	166
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	167	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	168	@ changeset: 3:f257fde29c7a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	169	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	170	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	171	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	172	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	173	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	174	o changeset: 2:337fec4d2edc
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	175	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	176	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	177	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	178	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	179	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	180	\| x changeset: 1:471597cad322
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	181	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	182	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	183	\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	184	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	185	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	186	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	187	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	188	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	189	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	190
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	191	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	192	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	193	$ hg update 471597cad322
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	194	abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	195	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	196	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	197	$ hg update --hidden 'min(desc(A0))'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	198	updating to a hidden changeset 471597cad322
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	199	(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	200	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	201
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	202	Test output with lots of splitted commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	203	========================================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	204
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	205	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	206	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	207
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	208	$ hg init $TESTTMP/local-lots-split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	209	$ cd $TESTTMP/local-lots-split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	210	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	211	$ echo 42 >> a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	212	$ echo 43 >> b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	213	$ echo 44 >> c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	214	$ echo 45 >> d
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	215	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	216	adding a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	217	adding b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	218	adding c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	219	adding d
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	220	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	221	@ changeset: 1:de7290d8b885
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	222	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	223	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	224	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	225	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	226	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	227	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	228	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	229	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	230	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	231
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	232	# Simulate a split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	233	$ hg up 0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	234	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	235
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	236	$ echo 42 >> a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	237	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	238	adding a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	239	created new head
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	240
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	241	$ echo 43 >> b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	242	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	243	adding b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	244
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	245	$ echo 44 >> c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	246	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	247	adding c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	248
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	249	$ echo 45 >> d
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	250	$ hg commit -A -m "A0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	251	adding d
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	252
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	253	$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	254	obsoleted 1 changesets
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	255
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	256	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	257	@ changeset: 5:c7f044602e9b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	258	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	259	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	260	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	261	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	262	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	263	o changeset: 4:1ae8bc733a14
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	264	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	265	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	266	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	267	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	268	o changeset: 3:f257fde29c7a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	269	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	270	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	271	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	272	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	273	o changeset: 2:337fec4d2edc
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	274	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	275	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	276	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	277	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	278	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	279	\| x changeset: 1:de7290d8b885
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	280	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	281	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	282	\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	283	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	284	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	285	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	286	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	287	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	288	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	289
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	290	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	291	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	292	$ hg update de7290d8b885
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	293	abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	294	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	295	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	296	$ hg update --hidden 'min(desc(A0))'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	297	updating to a hidden changeset de7290d8b885
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	298	(hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	299	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	300
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	301	Test output with folded commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	302	==============================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	303
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	304	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	305	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	306
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	307	$ hg init $TESTTMP/local-fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	308	$ cd $TESTTMP/local-fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	309	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	310	$ mkcommit A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	311	$ mkcommit B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	313	@ changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	314	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	315	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	\| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	318	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	319	o changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	321	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	322	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	324	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	327	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	328
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	329	# Simulate a fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	330	$ hg up 0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	331	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	332	$ echo "A0" > A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	333	$ echo "B0" > B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	334	$ hg add A0 B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	335	$ hg commit -m "C0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	336	created new head
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	337
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	338	$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	339	obsoleted 1 changesets
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35571 diff changeset	340	1 new orphan changesets
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	341	$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	342	obsoleted 1 changesets
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	343
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	344	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	345	@ changeset: 3:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	346	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	347	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	348	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	349	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	350	\| summary: C0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	351	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	352	\| x changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	353	\| \| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	354	\| \| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	355	\| \| obsolete: rewritten as 3:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	356	\| \| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	357	\| \|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	358	\| x changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	359	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	360	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	361	\| obsolete: rewritten as 3:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	362	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	363	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	364	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	365	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	366	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	368
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	369	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	370	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	371	$ hg update 471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	372	abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	373	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	374	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	375	$ hg update --hidden 'desc(A0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	376	updating to a hidden changeset 471f378eab4c
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	377	(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	378	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	$ hg update 0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	382	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	383	$ hg update --hidden 'desc(B0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	384	updating to a hidden changeset 0dec01379d3b
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	385	(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	386	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	387
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	388	Test output with divergence
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	389	===========================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	390
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	391	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	392	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	393
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	394	$ hg init $TESTTMP/local-divergence
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	395	$ cd $TESTTMP/local-divergence
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	396	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	397	$ mkcommit A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	398	$ hg commit --amend -m "A1"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	399	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	400	@ changeset: 2:fdf9bde5129a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	401	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	402	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	403	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	404	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	405	\| summary: A1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	406	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	407	\| x changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	408	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	409	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	410	\| obsolete: rewritten using amend as 2:fdf9bde5129a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	411	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	412	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	413	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	414	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	415	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	416	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	417
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	418	$ hg update --hidden 'desc(A0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	419	updating to a hidden changeset 471f378eab4c
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	420	(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	421	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	422	$ hg commit --amend -m "A2"
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35571 diff changeset	423	2 new content-divergent changesets
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	424	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	425	@ changeset: 3:65b757b745b9
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	426	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	427	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	428	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	429	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	430	\| instability: content-divergent
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	431	\| summary: A2
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	432	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	433	\| * changeset: 2:fdf9bde5129a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	434	\|/ parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	435	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	436	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	437	\| instability: content-divergent
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	438	\| summary: A1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	439	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	440	\| x changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	441	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	442	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	443	\| obsolete: rewritten using amend as 2:fdf9bde5129a
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	444	\| obsolete: rewritten using amend as 3:65b757b745b9
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	445	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	446	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	447	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	448	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	449	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	450	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	451
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	452	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	453	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	454	$ hg update 471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	455	abort: hidden revision '471f378eab4c' has diverged!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	456	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	457	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	458	$ hg update --hidden 'desc(A0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	459	updating to a hidden changeset 471f378eab4c
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	460	(hidden revision '471f378eab4c' has diverged)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	461	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	462
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	463	Test output with amended + folded commit
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	464	========================================
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	465
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	466	Test setup
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	467	----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	468
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	469	$ hg init $TESTTMP/local-amend-fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	470	$ cd $TESTTMP/local-amend-fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	471	$ mkcommit ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	472	$ mkcommit A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	473	$ mkcommit B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	474	$ hg commit --amend -m "B1"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	475	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	476	@ changeset: 3:b7ea6d14e664
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	477	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	478	\| parent: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	479	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	480	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	481	\| summary: B1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	482	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	483	\| x changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	484	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	485	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	486	\| obsolete: rewritten using amend as 3:b7ea6d14e664
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	487	\| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	488	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	489	o changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	490	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	491	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	492	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	493	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	494	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	495	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	496	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	497	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	498
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	499
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	500	# Simulate a fold
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	501	$ hg up 0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	502	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	503	$ echo "A0" > A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	504	$ echo "B0" > B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	505	$ hg add A0 B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	506	$ hg commit -m "C0"
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	507	created new head
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	508
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	509	$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	510	obsoleted 1 changesets
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35571 diff changeset	511	1 new orphan changesets
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	512	$ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	513	obsoleted 1 changesets
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	514
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	515	$ hg log --hidden -G
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	516	@ changeset: 4:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	517	\| tag: tip
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	518	\| parent: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	519	\| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	520	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	521	\| summary: C0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	522	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	523	\| x changeset: 3:b7ea6d14e664
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	524	\| \| parent: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	525	\| \| user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	526	\| \| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	527	\| \| obsolete: rewritten as 4:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	528	\| \| summary: B1
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	529	\| \|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	\| \| x changeset: 2:0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	531	\| \|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	532	\| \| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	\| \| obsolete: rewritten using amend as 3:b7ea6d14e664
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	\| \| summary: B0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	535	\| \|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	536	\| x changeset: 1:471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	537	\|/ user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	538	\| date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	539	\| obsolete: rewritten as 4:eb5a0daa2192
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	\| summary: A0
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	541	\|
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	542	o changeset: 0:ea207398892e
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	543	user: test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	544	date: Thu Jan 01 00:00:00 1970 +0000
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	summary: ROOT
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	546
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	Actual test
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	-----------
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	549	$ hg update 471f378eab4c
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	550	abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	551	(use --hidden to access hidden revisions)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	552	[255]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	553	$ hg update --hidden 'desc(A0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	554	updating to a hidden changeset 471f378eab4c
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	555	(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	556	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	557	$ hg update --hidden 0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	558	updating to a hidden changeset 0dec01379d3b
35711 35a0f6f31eef update: display the obsfate of hidden revision we update to Boris Feld <boris.feld@octobus.net> parents: 35709 diff changeset	559	(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	560	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	561	$ hg update 0dec01379d3b
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	562	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	563	$ hg update --hidden 'desc(B0)'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: diff changeset	564	0 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Martin von Zweigbergk <martinvonz@google.com>
	Fri, 09 Mar 2018 10:35:48 -0800
changeset 36927	17a744c5e270
parent 35711	35a0f6f31eef
child 37920	ea63a2004d09
permissions	-rw-r--r--