Mercurial: tests/test-rename.t@4eb1e9d6a7c9 (annotated)

12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	1	$ hg init
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	2	$ mkdir d1 d1/d11 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	3	$ echo d1/a > d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	4	$ echo d1/ba > d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	5	$ echo d1/a1 > d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	6	$ echo d1/b > d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	7	$ echo d2/b > d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	8	$ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12098 diff changeset	9	$ hg commit -m "1"
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	10
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	11	rename a single file
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	12
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	13	$ hg rename d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	14	$ hg sum
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12098 diff changeset	15	parent: 0:9b4b6e7b2c26 tip
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	16	1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	17	branch: default
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	18	commit: 1 renamed
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	19	update: (current)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	20	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	21	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	22	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	23	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	24	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	25	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	26	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	27
12898 f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	28	rename a single file using absolute paths
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	29
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	30	$ hg rename `pwd`/d1/d11/a1 `pwd`/d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	31	$ hg status -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	32	A d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	33	d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	34	R d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	35	$ hg update -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	36	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	37	$ rm d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	38
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	39	rename --after a single file
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	40
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	41	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	42	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	43	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	44	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	45	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	46	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	47	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	48	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	49	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	50
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	51	rename --after a single file when src and tgt already tracked
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	52
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	53	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	54	$ hg addrem -s 0
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	55	removing d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	56	adding d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	57	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	58	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	59	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	60	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	61	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	62	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	63	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	64	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	65
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	66	rename --after a single file to a nonexistant target filename
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	67
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	68	$ hg rename --after d1/a dummy
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	69	d1/a: not recording move - dummy does not exist
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	70
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	71	move a single file to an existing directory
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	72
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	73	$ hg rename d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	74	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	75	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	76	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	77	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	78	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	79	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	80	$ rm d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	81
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	82	move --after a single file to an existing directory
11223 0d09f2244805 rename: make --after work if source is already in R state Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11152 diff changeset	83
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	84	$ mv d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	85	$ hg rename --after d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	86	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	87	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	88	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	89	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	90	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	91	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	92	$ rm d2/a1
11152 e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 10466 diff changeset	93
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	94	rename a file using a relative path
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	95
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	96	$ (cd d1/d11; hg rename ../../d2/b e)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	97	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	98	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	99	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	100	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	101	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	102	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	103	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	104
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	105	rename --after a file using a relative path
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	106
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	107	$ (cd d1/d11; mv ../../d2/b e; hg rename --after ../../d2/b e)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	108	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	109	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	110	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	111	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	112	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	113	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	114	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	115
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	116	rename directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	117
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	118	$ hg rename d1/ d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	119	moving d1/a to d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	120	moving d1/b to d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	121	moving d1/ba to d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	122	moving d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	123	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	124	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	125	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	126	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	127	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	128	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	129	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	130	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	131	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	132	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	133	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	134	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	135	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	136	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	137	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	138	$ rm -rf d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	139
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	140	rename --after directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	141
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	142	$ mv d1 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	143	$ hg rename --after d1 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	144	moving d1/a to d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	145	moving d1/b to d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	146	moving d1/ba to d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	147	moving d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	148	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	149	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	150	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	151	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	152	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	153	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	154	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	155	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	156	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	157	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	158	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	159	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	160	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	161	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	162	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	163	$ rm -rf d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	164
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	165	move a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	166
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	167	$ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	168	moving ../d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	169	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	170	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	171	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	172	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	173	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	174	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	175	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	176
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	177	move --after a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	178
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	179	$ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	180	moving ../d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	181	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	182	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	183	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	184	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	185	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	186	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	187	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	188
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	189	move directory d1/d11 to an existing directory d2 (removes empty d1)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	190
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	191	$ hg rename d1/d11/ d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	192	moving d1/d11/a1 to d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	193	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	194	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	195	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	196	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	197	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	198	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	199	$ rm -rf d2/d11
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	200
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	201	move directories d1 and d2 to a new directory d3
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	202
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	203	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	204	$ hg rename d1 d2 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	205	moving d1/a to d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	206	moving d1/b to d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	207	moving d1/ba to d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	208	moving d1/d11/a1 to d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	209	moving d2/b to d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	210	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	211	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	212	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	213	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	214	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	215	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	216	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	217	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	218	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	219	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	220	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	221	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	222	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	223	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	224	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	225	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	226	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	227	5 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	228	$ rm -rf d3
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	229
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	230	move --after directories d1 and d2 to a new directory d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	231
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	232	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	233	$ mv d1 d2 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	234	$ hg rename --after d1 d2 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	235	moving d1/a to d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	236	moving d1/b to d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	237	moving d1/ba to d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	238	moving d1/d11/a1 to d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	239	moving d2/b to d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	240	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	241	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	242	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	243	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	244	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	245	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	246	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	247	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	248	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	249	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	250	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	251	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	252	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	253	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	254	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	255	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	256	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	257	5 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	258	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	259
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	260	move everything under directory d1 to existing directory d2, do not
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	261	overwrite existing files (d2/b)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	262
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	263	$ hg rename d1/* d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	264	d2/b: not overwriting - file exists
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	265	moving d1/d11/a1 to d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	266	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	267	A d2/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	268	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	269	A d2/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	270	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	271	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	272	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	273	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	274	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	275	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	276	$ diff -u d1/b d2/b
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	277	--- d1/b * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	278	+++ d2/b * (glob)
12405 1f6abbd38783 test-rename: accept solaris diff Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	279	@@ * (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	280	-d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	281	+d2/b
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	282	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	283	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	284	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	285	$ rm d2/a d2/ba d2/d11/a1
5329 7e6138cb8d38 copy: if destination ends with "/", make sure it's a directory Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4742 diff changeset	286
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	287	attempt to move one file into a non-existent directory
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	288
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	289	$ hg rename d1/a dx/
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	290	abort: destination dx/ is not a directory
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	291	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	292	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	293	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	294	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	295
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	296	attempt to move potentially more than one file into a non-existent directory
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	297
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	298	$ hg rename 'glob:d1/**' dx
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	299	abort: with multiple sources, destination must be an existing directory
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	300	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	301
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	302	move every file under d1 to d2/d21 (glob)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	303
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	304	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	305	$ hg rename 'glob:d1/**' d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	306	moving d1/a to d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	307	moving d1/b to d2/d21/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	308	moving d1/ba to d2/d21/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	309	moving d1/d11/a1 to d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	310	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	311	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	312	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	313	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	314	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	315	A d2/d21/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	316	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	317	A d2/d21/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	318	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	319	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	320	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	321	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	322	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	323	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	324	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	325	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	326
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	327	move --after some files under d1 to d2/d21 (glob)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	328
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	329	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	330	$ mv d1/a d1/d11/a1 d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	331	$ hg rename --after 'glob:d1/**' d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	332	moving d1/a to d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	333	d1/b: not recording move - d2/d21/b does not exist
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	334	d1/ba: not recording move - d2/d21/ba does not exist
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	335	moving d1/d11/a1 to d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	336	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	337	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	338	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	339	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	340	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	341	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	342	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	343	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	344	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	345	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	346
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	347	move every file under d1 starting with an 'a' to d2/d21 (regexp)
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	348
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	349	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	350	$ hg rename 're:d1/([^a][^/]/)a.*' d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	351	moving d1/a to d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	352	moving d1/d11/a1 to d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	353	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	354	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	355	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	356	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	357	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	358	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	359	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	360	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	361	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	362	$ rm -rf d2/d21
1513 5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	363
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	364	attempt to overwrite an existing file
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	365
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	366	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	367	$ hg rename d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	368	d1/ca: not overwriting - file exists
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	369	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	370	? d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	371	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	372	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	373
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	374	forced overwrite of an existing file
1513 5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	375
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	376	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	377	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	378	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	379	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	380	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	381	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	382	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	383	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	384	$ rm d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	385
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	386	attempt to overwrite an existing broken symlink
12342 70236d6fd844 rename: do not overwrite existing broken symlinks Patrick Mezard <pmezard@gmail.com> parents: 11331 diff changeset	387
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	388	$ ln -s ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	389	$ hg rename --traceback d1/ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	390	d1/ca: not overwriting - file exists
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	391	$ hg status -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	392	? d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	393	$ hg update -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	394	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	395	$ rm d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	396
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	397	replace a symlink with a file
1513 5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	398
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	399	$ ln -s ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	400	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	401	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	402	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	403	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	404	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	405	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	406	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	407	$ rm d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	408
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	409	do not copy more than one source file to the same destination file
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	410
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	411	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	412	$ hg rename d1/* d2/* d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	413	moving d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	414	d3/b: not overwriting - d2/b collides with d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	415	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	416	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	417	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	418	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	419	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	420	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	421	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	422	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	423	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	424	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	425	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	426	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	427	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	428	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	429	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	430	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	431
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	432	move a whole subtree with "hg rename ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	433
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	434	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	435	$ (cd d1; hg rename . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	436	moving a to ../d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	437	moving b to ../d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	438	moving ba to ../d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	439	moving d11/a1 to ../d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	440	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	441	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	442	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	443	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	444	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	445	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	446	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	447	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	448	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	449	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	450	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	451	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	452	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	453	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	454	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	455	$ rm -rf d3
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	456
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	457	move a whole subtree with "hg rename --after ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	458
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	459	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	460	$ mv d1/* d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	461	$ (cd d1; hg rename --after . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	462	moving a to ../d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	463	moving b to ../d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	464	moving ba to ../d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	465	moving d11/a1 to ../d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	466	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	467	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	468	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	469	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	470	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	471	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	472	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	473	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	474	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	475	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	476	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	477	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	478	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	479	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	480	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	481	$ rm -rf d3
1634 f49f602fae92 copy & rename can ignore removed source files Robin Farine <robin.farine@terminus.org> parents: 1633 diff changeset	482
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	483	move the parent tree with "hg rename .."
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	484
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	485	$ (cd d1/d11; hg rename .. ../../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	486	moving ../a to ../../d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	487	moving ../b to ../../d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	488	moving ../ba to ../../d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	489	moving a1 to ../../d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	490	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	491	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	492	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	493	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	494	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	495	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	496	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	497	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	498	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	499	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	500	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	501	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	502	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	503	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	504	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	505	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	506
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	507	skip removed files
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	508
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	509	$ hg remove d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	510	$ hg rename d1 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	511	moving d1/a to d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	512	moving d1/ba to d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	513	moving d1/d11/a1 to d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	514	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	515	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	516	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	517	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	518	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	519	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	520	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	521	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	522	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	523	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	524	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	525	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	526	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	527	$ rm -rf d3
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1747 diff changeset	528
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	529	transitive rename
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	530
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	531	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	532	$ hg rename d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	533	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	534	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	535	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	536	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	537	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	538	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	539	$ rm d1/bc
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	540
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	541	transitive rename --after
10466 d1f209bb9564 patch: separate reverse copy data (issue1959) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8518 diff changeset	542
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	543	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	544	$ mv d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	545	$ hg rename --after d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	546	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	547	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	548	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	549	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	550	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	551	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	552	$ rm d1/bc
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	553
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	554	$ echo "# idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)"
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	555	# idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	556	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	557	$ echo "some stuff added to d1/bb" >> d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	558	$ hg rename d1/bb d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	559	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	560	M d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	561	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	562	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	563
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	564	overwriting with renames (issue1959)
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	565
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	566	$ hg rename d1/a d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	567	$ hg rename d1/b d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	568	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	569	A d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	570	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	571	A d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	572	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	573	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	574	$ hg diff --git
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	575	diff --git a/d1/b b/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	576	rename from d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	577	rename to d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	578	diff --git a/d1/a b/d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	579	copy from d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	580	copy to d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	581	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	582	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	583
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	584	check illegal path components
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	585
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	586	$ hg rename d1/d11/a1 .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	587	abort: path contains illegal component: .hg/foo
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	588	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	589	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	590	$ hg rename d1/d11/a1 ../foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	591	abort: ../foo not under root
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	592	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	593	$ hg status -C
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	594
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	595	$ mv d1/d11/a1 .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	596	$ hg rename --after d1/d11/a1 .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	597	abort: path contains illegal component: .hg/foo
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	598	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	599	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	600	! d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	601	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	602	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	603	$ rm .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	604
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	605	$ hg rename d1/d11/a1 .hg
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	606	abort: path contains illegal component: .hg/a1
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	607	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	608	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	609	$ hg rename d1/d11/a1 ..
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	610	abort: ../a1 not under root
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	611	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	612	$ hg status -C
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	613
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	614	$ mv d1/d11/a1 .hg
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	615	$ hg rename --after d1/d11/a1 .hg
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	616	abort: path contains illegal component: .hg/a1
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	617	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	618	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	619	! d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	620	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	621	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	622	$ rm .hg/a1
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	623
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	624	$ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	625	abort: path contains illegal component: .hg/foo
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	626	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	627	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	628	$ (cd d1/d11; hg rename ../../d2/b ../../../foo)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	629	abort: ../../../foo not under root
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	630	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	631	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	632

author	Matt Mackall <mpm@selenic.com>
	Fri, 25 Feb 2011 15:31:32 -0600
branch	stable
changeset 13481	4eb1e9d6a7c9
parent 12898	f2fd909053d9
child 13962	8b252e826c68
permissions	-rw-r--r--