Mercurial: tests/test-subrepo.out@e0121ad90b57 (annotated)

8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	1	% first revision, no sub
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	2	adding a
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	3	% add first sub
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	4	adding a
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	5	committing subrepository s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	6	% add sub sub
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	7	committing subrepository s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	8	committing subrepository ss
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	9	% bump sub rev
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	10	committing subrepository s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	11	% leave sub dirty
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	12	committing subrepository s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	13	changeset: 3:1c833a7a9e3a
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	14	tag: tip
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	15	user: test
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	16	date: Thu Jan 01 00:00:00 1970 +0000
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	17	summary: 4
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	18
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	19	% check caching
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	20	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	21	% restore
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	22	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	23	path s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	24	source s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	25	revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	26	% new branch for merge tests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	27	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	28	adding t/t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	29	% 5
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	30	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	31	created new head
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	32	% 6
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	33	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	34	path s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	35	source s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	36	revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	37	path t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	38	source t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	39	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	40	% 7
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	41	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	42	% 8
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	43	% merge tests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	44	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	45	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	46	(branch merge, don't forget to commit)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	47	path s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	48	source s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	49	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	50	path t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	51	source t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	52	revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	53	created new head
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	54	searching for copies back to rev 2
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	55	resolving manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	56	overwrite None partial False
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	57	ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	58	.hgsubstate: versions differ -> m
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9611 diff changeset	59	subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
10177 5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 9783 diff changeset	60	subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9611 diff changeset	61	getting subrepo t
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	62	resolving manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	63	overwrite True partial False
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	64	ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	65	t: remote is newer -> g
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	66	getting t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	67	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	68	(branch merge, don't forget to commit)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	69	path s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	70	source s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	71	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	72	path t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	73	source t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	74	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	75	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	76	searching for copies back to rev 2
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	77	resolving manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	78	overwrite None partial False
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	79	ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	80	.hgsubstate: versions differ -> m
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9611 diff changeset	81	subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
10177 5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 9783 diff changeset	82	subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9611 diff changeset	83	merging subrepo t
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	84	searching for copies back to rev 2
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	85	resolving manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	86	overwrite None partial False
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	87	ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	88	t: versions differ -> m
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	89	preserving t for resolve of t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	90	picked tool 'internal:merge' for t (binary False symlink False)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	91	merging t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	92	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	93	warning: conflicts during merge.
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	94	merging t failed!
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	95	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
9468 b2310903c462 hg: say 'hg update' instead of 'hg up' in merge status message Stuart W Marks <smarks@smarks.org> parents: 8995 diff changeset	96	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	97	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	98	(branch merge, don't forget to commit)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	99	% should conflict
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	100	<<<<<<< local
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	101	conflict
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	102	=======
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	103	t3
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	104	>>>>>>> other
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	105	% clone
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 9468 diff changeset	106	updating to branch default
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	107	pulling subrepo s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	108	requesting all changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	109	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	110	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	111	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	112	added 4 changesets with 5 changes to 3 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	113	pulling subrepo ss
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	114	requesting all changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	115	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	116	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	117	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	118	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	119	pulling subrepo t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	120	requesting all changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	121	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	122	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	123	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	124	added 4 changesets with 4 changes to 1 files (+1 heads)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	125	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	126	path s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	127	source s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	128	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	129	path t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	130	source t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	131	revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	132	% push
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	133	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	134	pushing ...sub/t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	135	pushing ...subrepo ss
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	136	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	137	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	138	pushing ...subrepo s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	139	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	140	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	141	pushing ...subrepo t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	142	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	143	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	144	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	145	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	146	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	147	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	148	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	149	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	150	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	151	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	152	% push -f
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	153	committing subrepository s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	154	abort: push creates new remote heads!
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	155	pushing ...sub/t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	156	pushing ...subrepo ss
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	157	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	158	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	159	pushing ...subrepo s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	160	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	161	(did you forget to merge? use push -f to force)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	162	pushing ...subrepo t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	163	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	164	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	165	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	166	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	167	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	168	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	169	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	170	pushing ...sub/t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	171	pushing ...subrepo ss
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	172	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	173	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	174	pushing ...subrepo s
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	175	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	176	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	177	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	178	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	179	added 1 changesets with 1 changes to 1 files (+1 heads)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	180	pushing ...subrepo t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	181	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	182	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	183	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	184	no changes found
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	185	% update
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	186	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	187	committing subrepository t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	188	% pull
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	189	pulling ...sub/t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	190	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	191	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	192	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	193	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	194	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	195	(run 'hg update' to get a working copy)
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	196	pulling subrepo t
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	197	searching for changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	198	adding changesets
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	199	adding manifests
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	200	adding file changes
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	201	added 1 changesets with 1 changes to 1 files
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	202	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	203	blah
10177 5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 9783 diff changeset	204	% bogus subrepo path aborts
5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 9783 diff changeset	205	abort: missing ] in subrepo source
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	206	% issue 1986
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	207	adding a
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	208	marked working directory as branch br
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	209	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	210	adding b
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	211	created new head
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	212	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	213	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	214	(branch merge, don't forget to commit)
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	215	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	216	adding c
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	217	created new head
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	218	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	219	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	220	(branch merge, don't forget to commit)
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	221	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	222	adding .hgsub
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	223	committing subrepository s
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	224	marked working directory as branch br
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	225	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	226	adding b
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	227	committing subrepository s
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	228	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	229	adding c
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	230	created new head
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	231	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	232	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	233	(branch merge, don't forget to commit)
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	234	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	235	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	236	adding d
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	237	committing subrepository s
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	238	created new head
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	239	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	240	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	241	adding e
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	242	committing subrepository s
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	243	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	244	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9783 diff changeset	245	(branch merge, don't forget to commit)

author	Matt Mackall <mpm@selenic.com>
	Thu, 28 Jan 2010 22:44:25 -0600
changeset 10288	e0121ad90b57
parent 10252	0bc93fa2cf2b
child 10378	e1401c74572f
permissions	-rw-r--r--