mercurial: tests/test-convert-filemap.out@439d7ea6fe3a (annotated)

6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5405 diff changeset	1	created new head
4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5405 diff changeset	2	created new head
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	3	@ 8 "8: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	4	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	5	o 7 "7: second merge; change bar" files: bar baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	6	\|\
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	7	\| o 6 "6: change foo baz" files: baz foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	8	\| \|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	9	o \| 5 "5: change bar baz quux" files: bar baz quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	10	\|/
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	11	o 4 "4: first merge; change bar baz" files: bar baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	12	\|\
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	13	\| o 3 "3: change bar quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	14	\| \|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	15	o \| 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	16	\|/
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	17	o 1 "1: add bar quux; copy foo to copied" files: bar copied quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	18	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	19	o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	20
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	21	% final file versions in this repo:
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	22	9463f52fe115e377cf2878d4fc548117211063f2 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	23	94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	24	6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	25	3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	26	75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	27	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	28	bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	29	copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	30
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	31	% foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	32	@ 3 "8: change foo" files: foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	33	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	34	o 2 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	35	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	36	o 1 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	37	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	38	o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	39
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	40	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	41	% bar: merges are not merges anymore
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	42	@ 4 "7: second merge; change bar" files: bar
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	43	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	44	o 3 "5: change bar baz quux" files: bar
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	45	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	46	o 2 "4: first merge; change bar baz" files: bar
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	47	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	48	o 1 "3: change bar quux" files: bar
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	49	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	50	o 0 "1: add bar quux; copy foo to copied" files: bar
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	51
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	52	9463f52fe115e377cf2878d4fc548117211063f2 644 bar
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	53	% baz: 1st merge is not a merge anymore; 2nd still is
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	54	@ 4 "7: second merge; change bar" files: baz
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	55	\|\
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	56	\| o 3 "6: change foo baz" files: baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	57	\| \|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	58	o \| 2 "5: change bar baz quux" files: baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	59	\|/
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	60	o 1 "4: first merge; change bar baz" files: baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	61	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	62	o 0 "0: add foo baz dir/" files: baz
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	63
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	64	94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	65	% foo quux: we add additional merges when they are interesting
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	66	@ 8 "8: change foo" files: foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	67	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	68	o 7 "7: second merge; change bar" files:
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	69	\|\
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	70	\| o 6 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	71	\| \|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	72	o \| 5 "5: change bar baz quux" files: quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	73	\|/
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	74	o 4 "4: first merge; change bar baz" files:
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	75	\|\
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	76	\| o 3 "3: change bar quux" files: quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	77	\| \|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	78	o \| 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	79	\|/
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	80	o 1 "1: add bar quux; copy foo to copied" files: quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	81	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	82	o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	83
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	84	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	85	bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	86	% bar quux: partial conversion
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	87	@ 1 "3: change bar quux" files: bar quux
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	88	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	89	o 0 "1: add bar quux; copy foo to copied" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	90
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	91	b79105bedc55102f394e90a789c9c380117c1b4a 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	92	db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	93	% bar quux: complete the partial conversion
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	94	@ 4 "7: second merge; change bar" files: bar
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	95	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	96	o 3 "5: change bar baz quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	97	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	98	o 2 "4: first merge; change bar baz" files: bar
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	99	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	100	o 1 "3: change bar quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	101	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	102	o 0 "1: add bar quux; copy foo to copied" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	103
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	104	9463f52fe115e377cf2878d4fc548117211063f2 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	105	bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	106	% foo: partial conversion
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	107	@ 0 "0: add foo baz dir/" files: foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	108
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	109	2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	110	% foo: complete the partial conversion
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	111	@ 3 "8: change foo" files: foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	112	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	113	o 2 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	114	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	115	o 1 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	116	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	117	o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	118
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	119	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	120	% copied: copied file; source not included in new repo
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	121	@ 0 "1: add bar quux; copy foo to copied" files: copied
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	122
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	123	2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	124	copied not renamed
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	125	% foo copied: copied file; source included in new repo
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	126	@ 4 "8: change foo" files: foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	127	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	128	o 3 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	129	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	130	o 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	131	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	132	o 1 "1: add bar quux; copy foo to copied" files: copied
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	133	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	134	o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	135
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	136	6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	137	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	138	copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
6737 7239e06e58e9 context: consistently return p1 context for None Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	139	@ 4 "8: change foo" files: foo2
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	140	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	141	o 3 "6: change foo baz" files: foo2
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	142	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	143	o 2 "2: change foo" files: foo2
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	144	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	145	o 1 "1: add bar quux; copy foo to copied" files: copied2
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	146	\|
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	147	o 0 "0: add foo baz dir/" files: dir2/file foo2
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	148
5405 8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	149	e5e3d520be9be45937d0b06b004fadcd6c221fa2 644 copied2
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	150	3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file
8feb33c2d153 Display symlink or executable bit with manifest -v Patrick Mezard <pmezard@gmail.com> parents: 5379 diff changeset	151	9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
5379 d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	152	copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	153	copied:
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	154	foo
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	155	copied2:
d3e51dc804f8 mercurial_source: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	156	foo

author	Matt Mackall <mpm@selenic.com>
	Tue, 01 Dec 2009 19:28:15 -0600
branch	stable
changeset 9984	439d7ea6fe3a
parent 6737	7239e06e58e9
child 9885	b1addc725998
permissions	-rw-r--r--