evolve: tests/test-topic.t@c8e4c6e03957 (annotated)

1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	1	$ . "$TESTDIR/testlib"
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	3	$ hg init pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	4	$ cd pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	5	$ cat <<EOF >> .hg/hgrc
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	6	> [phases]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	7	> publish=false
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	8	> EOF
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	9
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	10	$ hg help topics
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1844 diff changeset	11	hg topics [TOPIC]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	12
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	13	View current topic, set current topic, or see all topics.
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	14
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	15	options:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	16
1895 c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	17	--clear clear active topic if any
c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	18	--change VALUE revset of existing revisions to change topic
c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	19	-l --list show the stack of changeset in the topic
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	20
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	21	(some details hidden, use --verbose to show complete help)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	22	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	23
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	24	Test topics interaction with evolution:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	25
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	26	$ hg topics --config experimental.evolution=
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	27	$ hg topics --config experimental.evolution= --change . bob
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	28	abort: must have obsolete enabled to use --change
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	29	[255]
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	30
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	31	Create some changes:
67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	32
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	33	$ for x in alpha beta gamma delta ; do
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	34	> echo file $x >> $x
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	35	> hg addremove
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	36	> hg ci -m "Add file $x"
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	37	> done
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	38	adding alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	39	adding beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	40	adding gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	41	adding delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	42
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	43	Still no topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	44	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	45
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	46	Test commit flag and help text
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	47
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	48	$ echo stuff >> alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	49	$ HGEDITOR=cat hg ci -t topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	50
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	51
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	52	HG: Enter commit message. Lines beginning with 'HG:' are removed.
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	53	HG: Leave message empty to abort commit.
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	54	HG: --
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	55	HG: user: test
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	56	HG: topic 'topicflag'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	57	HG: branch 'default'
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	58	HG: changed alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	59	abort: empty commit message
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	60	[255]
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	61	$ hg revert alpha
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	62	$ hg topic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	63	* topicflag
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	64
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	65	Make a topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	66	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	67	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	68	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	69	$ echo topic work >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	70	$ hg ci -m 'start on narf'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	71	$ hg co .^
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	72	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	73	$ hg topic fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	74	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	75	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	76	narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	77	$ echo >> fran work >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	78	$ hg ci -m 'start on fran'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	79	$ hg co narf
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	80	switching to topic narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	81	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	82	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	83	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	84	* narf
1869 995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	85	$ hg log -r . -T '{topics}\n'
995617c7f2fc template: test that topic is accessible through template Pierre-Yves David <pierre-yves.david@fb.com> parents: 1868 diff changeset	86	narf
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	87	$ echo 'narf!!!' >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	88	$ hg ci -m 'narf!'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	89	created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	90	$ hg log -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	91	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	92	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	93	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	94	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	95	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	96	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	97	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	98	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	99	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	100	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	101	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	102	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	103	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	104	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	105	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	106	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	107	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	108	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	109	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	110	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	111	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	112	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	113	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	114	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	115	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	116	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	117	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	118	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	119	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	120	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	121	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	122	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	123	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	124	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	125	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	126	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	127	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	128	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	129	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	130	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	131
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	132
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	133	Exchanging of topics:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	134	$ cd ..
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	135	$ hg init brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	136	$ hg -R pinky push -r 4 brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	137	pushing to brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	138	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	139	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	140	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	141	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	142	added 5 changesets with 5 changes to 4 files
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	143
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	144	Export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	145
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	146	$ hg -R pinky export
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	147	# HG changeset patch
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	148	# User test
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	149	# Date 0 0
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	150	# Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	151	# Node ID 7c34953036d6a36eae468c550d0592b89ee8bffc
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	152	# Parent fb147b0b417c25ca15547cd945acf51cf8dcaf02
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	153	# EXP-Topic narf
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	154	narf!
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	155
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	156	diff -r fb147b0b417c -r 7c34953036d6 alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	157	--- a/alpha Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	158	+++ b/alpha Thu Jan 01 00:00:00 1970 +0000
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	159	@@ -1,2 +1,3 @@
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	160	file alpha
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	161	topic work
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1864 diff changeset	162	+narf!!!
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	163
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	164	Import
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	165
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	166	$ hg -R pinky export > narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	167	$ hg -R pinky --config extensions.strip= strip .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	168	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	169	saved backup bundle to $TESTTMP/pinky/.hg/strip-backup/7c34953036d6-1ff3bae2-backup.hg (glob)
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	170	$ hg -R pinky import narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	171	applying narf.diff
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	172	$ hg -R pinky log -r .
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	173	changeset: 6:7c34953036d6
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	174	tag: tip
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	175	topic: narf
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	176	parent: 4:fb147b0b417c
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	177	user: test
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	178	date: Thu Jan 01 00:00:00 1970 +0000
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	179	summary: narf!
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	180
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	181	Now that we've pushed to brain, the work done on narf is no longer a
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	182	draft, so we won't see that topic name anymore:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	183
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	184	$ hg log -R pinky -G
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	185	@ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	186	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	187	\| topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	188	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	189	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	190	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	191	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	192	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	193	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	194	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	195	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	196	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	197	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	198	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	199	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	200	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	201	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	202	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	203	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	204	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	205	o changeset: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	206	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	207	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	208	\| summary: Add file delta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	209	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	210	o changeset: 2:15d1eb11d2fa
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	211	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	212	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	213	\| summary: Add file gamma
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	214	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	215	o changeset: 1:c692ea2c9224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	216	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	217	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	218	\| summary: Add file beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	219	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	220	o changeset: 0:c2b7d2f7d14b
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	221	user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	222	date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	223	summary: Add file alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	225	$ cd brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	226	$ hg co tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	227	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	228
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	229	Because the change is public, we won't inherit the topic from narf.
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	230
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	231	$ hg topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	232	$ echo what >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	233	$ hg topic query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	234	$ hg ci -m 'what is narf, pinky?'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	235	$ hg log -Gl2
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	236	@ changeset: 5:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	237	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	238	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	239	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	240	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	241	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	242	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	243	o changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	244	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	245	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	246	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	247	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	248	$ hg push -f ../pinky -r query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	249	pushing to ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	250	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	251	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	252	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	253	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	254	added 1 changesets with 1 changes to 1 files (+1 heads)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	255	$ hg -R ../pinky log -Gl 4
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	256	o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	258	\| topic: query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	259	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	260	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	261	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	262	\| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	263	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	264	\| @ changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	265	\|/ topic: narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	266	\| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	267	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	268	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	269	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	270	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	271	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	272	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	273	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	274	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	275	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	276	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	277	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	278	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	279	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	280	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	281	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	282	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	283	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	284	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	285	$ cd ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	286	$ hg co query
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	287	switching to topic query
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	288	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	289	$ echo answer >> alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	290	$ hg ci -m 'Narf is like `zort` or `poit`!'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	291	created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	292	$ hg merge narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	293	merging alpha
1868 5cdd5e0a421c test: adapt to newer mercurial Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	294	warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	295	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	296	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	297	[1]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	298	$ hg revert -r narf alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	299	$ hg resolve -m alpha
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	300	(no more unresolved files)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	301	$ hg topic narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	302	$ hg ci -m 'Finish narf'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	303	created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	304	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	305	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	306	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	307	query
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	308	$ hg debugnamecomplete # branch:topic here is a buggy side effect
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	309	default
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	310	default:fran
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	311	default:narf
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	312	default:query
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	313	fran
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	314	narf
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	315	query
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	316	tip
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	317	$ hg phase --public narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	318
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	319	POSSIBLE BUG: narf topic stays alive even though we just made all
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	320	narf commits public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	321
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	322	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	323	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	324	* narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	325	$ hg log -Gl 6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	326	@ changeset: 9:ae074045b7a7
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	327	\|\ tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	328	\| \| parent: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	329	\| \| parent: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	330	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	331	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	332	\| \| summary: Finish narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	333	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	334	\| o changeset: 8:54c943c1c167
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	335	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	336	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	337	\| \| summary: Narf is like `zort` or `poit`!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	338	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	339	\| o changeset: 7:c01515cfc331
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	340	\| \| parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	341	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	342	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	343	\| \| summary: what is narf, pinky?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	344	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	345	o \| changeset: 6:7c34953036d6
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	346	\|/ parent: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	347	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	348	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	349	\| summary: narf!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	350	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	351	\| o changeset: 5:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	352	\| \| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	353	\| \| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	354	\| \| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	355	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	356	\| \| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	357	\| \|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	358	o \| changeset: 4:fb147b0b417c
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	359	\|/ user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	360	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	361	\| summary: start on narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	362	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	363	$ cd ../brain
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	364	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	365	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	366	$ hg pull ../pinky -r narf
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	367	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	368	abort: unknown revision 'narf'!
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	369	[255]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	370	$ hg pull ../pinky -r default
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	371	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	372	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	373	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	374	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	375	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	376	added 3 changesets with 3 changes to 1 files
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	377	(run 'hg update' to get a working copy)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	378	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	379	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	380
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	381	We can pull in the draft-phase change and we get the new topic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	382
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	383	$ hg pull ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	384	pulling from ../pinky
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	385	searching for changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	386	adding changesets
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	387	adding manifests
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	388	adding file changes
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	389	added 1 changesets with 1 changes to 1 files (+1 heads)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	390	(run 'hg heads' to see heads)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	391	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	392	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	393	* query
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	394	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	395	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	396	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	397	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	398	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	399	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	400	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	401	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	402	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	403
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	404	query is not an open topic, so when we clear the current topic it'll
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	405	disappear:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	406
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	407	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	408	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	409	fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	410
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	411	--clear when we don't have an active topic isn't an error:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	412
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	413	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	414
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	415	Topic revset
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	416	$ hg log -r 'topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	417	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	418	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	419	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	420	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	421	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	422	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	423	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	424	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	425	$ hg log -r 'not topic()' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	426	o changeset: 8:ae074045b7a7
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	427	\|\ parent: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	428	\| \| parent: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	429	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	430	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	431	\| \| summary: Finish narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	432	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	433	\| o changeset: 7:54c943c1c167
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	434	\| \| parent: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	435	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	436	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	437	\| \| summary: Narf is like `zort` or `poit`!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	438	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	439	o \| changeset: 6:7c34953036d6
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	440	\| \| parent: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	441	\| \| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	442	\| \| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	443	\| \| summary: narf!
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	444	\| \|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	445	\| @ changeset: 5:c01515cfc331
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	446	\|/ user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	447	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	448	\| summary: what is narf, pinky?
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	449	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	450	o changeset: 4:fb147b0b417c
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	451	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	452	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	453	\| summary: start on narf
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	454	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	455	o changeset: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	456	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	457	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	458	\| summary: Add file delta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	459	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	460	o changeset: 2:15d1eb11d2fa
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	461	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	462	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	463	\| summary: Add file gamma
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	464	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	465	o changeset: 1:c692ea2c9224
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	466	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	467	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	468	\| summary: Add file beta
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	469	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	470	o changeset: 0:c2b7d2f7d14b
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	471	user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	472	date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	473	summary: Add file alpha
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	474
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	475	No matches because narf is already closed:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	476	$ hg log -r 'topic(narf)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	477	This regexp should match the topic `fran`:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	478	$ hg log -r 'topic("re:.ra.")' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	479	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	480	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	481	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	482	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	483	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	484	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	485	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	486	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	487	Exact match on fran:
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	488	$ hg log -r 'topic(fran)' -G
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	489	o changeset: 9:0469d521db49
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	490	\| tag: tip
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	491	\| topic: fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	492	\| parent: 3:a53952faf762
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	493	\| user: test
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	494	\| date: Thu Jan 01 00:00:00 1970 +0000
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	495	\| summary: start on fran
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	496	\|
0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1839 diff changeset	497
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	498	Match current topic:
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	499	$ hg topic
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	500	fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	501	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	502	(no output is expected)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	503	$ hg co fran
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	504	switching to topic fran
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	505	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1864 70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	506	$ hg log -r 'topic(.)'
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	507	changeset: 9:0469d521db49
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	508	tag: tip
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	509	topic: fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	510	parent: 3:a53952faf762
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	511	user: test
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	512	date: Thu Jan 01 00:00:00 1970 +0000
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	513	summary: start on fran
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	514
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	515
70d1191fceed topic: allow use of topic(.) to match the p1 topic Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	516	Deactivate the topic.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	517	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	518	* fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	519	$ hg topics --clear
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	520	$ echo fran? >> beta
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	521	$ hg ci -m 'fran?'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1874 diff changeset	522	created new head
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	523	$ hg log -Gr 'draft()'
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	524	@ changeset: 10:4073470c35e1
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	525	\| tag: tip
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	526	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	527	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	528	\| summary: fran?
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	529	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	530	o changeset: 9:0469d521db49
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	531	\| topic: fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	532	\| parent: 3:a53952faf762
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	533	\| user: test
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	534	\| date: Thu Jan 01 00:00:00 1970 +0000
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	535	\| summary: start on fran
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	536	\|
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	537	$ hg topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	538	fran
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	539	Changing topic fails if we don't give a topic
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	540	$ hg topic --change 9
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	541	abort: changing topic requires a topic name or --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	542	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	543
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	544	Can't change topic of a public change
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	545	$ hg topic --change 1:: --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	546	abort: can't change topic of a public change
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	547	[255]
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	548
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	549	Can clear topics
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	550	$ hg topic --change 9 --clear
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	551	changed topic on 1 changes
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	552	please run hg evolve --rev "not topic()" now
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	553	$ hg log -Gr 'draft() and not obsolete()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	554	o changeset: 11:783930e1d79e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	555	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	556	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	557	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	558	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	559	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	560	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	561	\| @ changeset: 10:4073470c35e1
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	562	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	563	\| \| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	564	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	565	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	566
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	567	Normally you'd do this with evolve, but we'll use rebase to avoid
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	568	bonus deps in the testsuite.
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	569
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	570	$ hg rebase -d tip -s .
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	571	rebasing 10:4073470c35e1 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	572
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	573	Can add a topic to an existing change
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	574	$ hg topic --change 11 wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	575	changed topic on 1 changes
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	576	please run hg evolve --rev "topic(wat)" now
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	577	$ hg log -Gr 'draft() and not obsolete()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	578	o changeset: 13:d91cd8fd490e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	579	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	580	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	581	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	582	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	583	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	584	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	585	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	586	\| @ changeset: 12:d9e32f4c4806
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	587	\| \| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	588	\| \| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	589	\| \| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	590	\| \|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	591
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	592	Normally you'd do this with evolve, but we'll use rebase to avoid
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	593	bonus deps in the testsuite.
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	594
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	595	$ hg rebase -d tip -s .
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	596	rebasing 12:d9e32f4c4806 "fran?"
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	597
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	598	$ hg log -Gr 'draft()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	599	@ changeset: 14:cf24ad8bbef5
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	600	\| tag: tip
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	601	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	602	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	603	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	604	\| summary: fran?
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	605	\|
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	606	o changeset: 13:d91cd8fd490e
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	607	\| topic: wat
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	608	\| parent: 3:a53952faf762
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	609	\| user: test
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	610	\| date: Thu Jan 01 00:00:00 1970 +0000
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	611	\| summary: start on fran
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	612	\|
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	613
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	614	Amend a topic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	615
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	616	$ hg topic watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	617	$ hg ci --amend
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	618	$ hg log -Gr 'draft()'
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	619	@ changeset: 16:893ffcf66c1f
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	620	\| tag: tip
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	621	\| topic: watwat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	622	\| parent: 13:d91cd8fd490e
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	623	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	624	\| date: Thu Jan 01 00:00:00 1970 +0000
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	625	\| summary: fran?
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	626	\|
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	627	o changeset: 13:d91cd8fd490e
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	628	\| topic: wat
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	629	\| parent: 3:a53952faf762
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	630	\| user: test
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	631	\| date: Thu Jan 01 00:00:00 1970 +0000
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	632	\| summary: start on fran
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	633	\|
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	634
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	635	Clear and amend:
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	636
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	637	$ hg topic --clear
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	638	$ hg ci --amend
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	639	$ hg log -r .
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	640	changeset: 18:a13639e22b65
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	641	tag: tip
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	642	parent: 13:d91cd8fd490e
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	643	user: test
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	644	date: Thu Jan 01 00:00:00 1970 +0000
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	645	summary: fran?
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1858 diff changeset	646
1874 ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	647	Readding the same topic with topic --change should work:
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	648	$ hg topic --change . watwat
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1869 diff changeset	649	changed topic on 1 changes

author	Pierre-Yves David <pierre-yves.david@fb.com>
	Mon, 14 Mar 2016 17:37:39 +0000
changeset 1895	c8e4c6e03957
parent 1885	d49f75eab6a3
child 1931	1cc2b87c91df
permissions	-rw-r--r--