Mercurial: tests/test-rename.t@75f9f366e5cc (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
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: 12898 diff changeset	14	$ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml
33798 2cd5aba5e1d2 scmutil: use util.shellquote instead of %r Augie Fackler <augie@google.com> parents: 33212 diff changeset	15	abort: filename contains 'con', which is reserved on Windows: d1/con.xml
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: 12898 diff changeset	16	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	17	$ hg sum
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12098 diff changeset	18	parent: 0:9b4b6e7b2c26 tip
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	19	1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	20	branch: default
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	21	commit: 1 renamed
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	22	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	23	phases: 1 draft
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	24	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	25	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	26	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	27	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	28	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	29	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	30	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	31
12898 f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	32	rename a single file using absolute paths
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	33
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	34	$ 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	35	$ hg status -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	36	A d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	37	d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	38	R d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	39	$ hg update -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	40	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	41	$ rm d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	42
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	43	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	44
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	45	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	46	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	47	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	48	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	49	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	50	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	51	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	52	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	53	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	54
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	55	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	56
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	57	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	58	$ hg addrem -s 0
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	59	removing d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	60	adding d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	61	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	62	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	63	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	64	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	65	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	66	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	67	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	68	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	69
17492 973c2b0b403c spelling: nonexistent timeless@mozdev.org parents: 16902 diff changeset	70	rename --after a single file to a nonexistent target filename
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	71
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	72	$ hg rename --after d1/a dummy
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	73	d1/a: not recording move - dummy does not exist (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	74
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	75	move a single file to an existing directory
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	76
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	77	$ hg rename d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	78	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	79	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	80	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	81	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	82	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	83	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	84	$ rm d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	85
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	86	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	87
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	88	$ mv d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	89	$ hg rename --after d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	90	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	91	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	92	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	93	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	94	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	95	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	96	$ 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	97
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	98	rename a file using a relative path
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	99
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	100	$ (cd d1/d11; hg rename ../../d2/b e)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	101	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	102	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	103	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	104	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	105	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	106	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	107	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	108
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	109	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	110
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	111	$ (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	112	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	113	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	114	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	115	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	116	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	117	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	118	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	119
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	120	rename directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	121
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	122	$ hg rename d1/ d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	123	moving d1/a to d3/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	124	moving d1/b to d3/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	125	moving d1/ba to d3/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	126	moving d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	127	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	128	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	129	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	130	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	131	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	132	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	133	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	134	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	135	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	136	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	137	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	138	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	139	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	140	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	141	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	142	$ rm -rf d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	143
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	144	rename --after directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	145
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	146	$ mv d1 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	147	$ hg rename --after d1 d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	148	moving d1/a to d3/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	149	moving d1/b to d3/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	150	moving d1/ba to d3/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	151	moving d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	152	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	153	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	154	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	155	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	156	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	157	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	158	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	159	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	160	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	161	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	162	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	163	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	164	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	165	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	166	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	167	$ rm -rf d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	168
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	169	move a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	170
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	171	$ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	172	moving ../d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	173	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	174	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	175	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	176	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	177	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	178	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	179	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	180
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	181	move --after a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	182
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	183	$ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	184	moving ../d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	185	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	186	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	187	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	188	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	189	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	190	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	191	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	192
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	193	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	194
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	195	$ hg rename d1/d11/ d2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	196	moving d1/d11/a1 to d2/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	197	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	198	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	199	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	200	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	201	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	202	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	203	$ rm -rf d2/d11
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	204
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	205	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	206
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	207	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	208	$ hg rename d1 d2 d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	209	moving d1/a to d3/d1/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	210	moving d1/b to d3/d1/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	211	moving d1/ba to d3/d1/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	212	moving d1/d11/a1 to d3/d1/d11/a1 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	213	moving d2/b to d3/d2/b (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	214	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	215	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	216	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	217	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	218	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	219	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	220	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	221	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	222	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	223	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	224	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	225	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	226	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	227	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	228	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	229	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	230	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	231	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	232	$ rm -rf d3
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	233
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	234	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	235
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	236	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	237	$ mv d1 d2 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	238	$ hg rename --after d1 d2 d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	239	moving d1/a to d3/d1/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	240	moving d1/b to d3/d1/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	241	moving d1/ba to d3/d1/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	242	moving d1/d11/a1 to d3/d1/d11/a1 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	243	moving d2/b to d3/d2/b (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	244	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	245	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	246	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	247	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	248	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	249	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	250	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	251	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	252	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	253	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	254	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	255	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	256	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	257	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	258	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	259	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	260	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	261	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	262	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	263
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	264	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	265	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	266
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	267	$ hg rename d1/* d2
30151 381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 25382 diff changeset	268	d2/b: not overwriting - file already committed
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 25382 diff changeset	269	(hg rename --force to replace the file by recording a rename)
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	270	moving d1/d11/a1 to d2/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	271	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	272	A d2/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	273	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	274	A d2/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	275	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	276	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	277	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	278	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	279	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	280	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	281	$ diff -u d1/b d2/b
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	282	--- d1/b * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	283	+++ d2/b * (glob)
12405 1f6abbd38783 test-rename: accept solaris diff Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	284	@@ * (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	285	-d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	286	+d2/b
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	287	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	288	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	289	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	290	$ 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	291
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	292	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	293
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	294	$ hg rename d1/a dx/
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	295	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	296	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	297	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	298	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	299	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	300
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	301	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	302
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	303	$ hg rename 'glob:d1/**' dx
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	304	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	305	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	306
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	307	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	308
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	309	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	310	$ hg rename 'glob:d1/**' d2/d21
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	311	moving d1/a to d2/d21/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	312	moving d1/b to d2/d21/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	313	moving d1/ba to d2/d21/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	314	moving d1/d11/a1 to d2/d21/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	315	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	316	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	317	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	318	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	319	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	320	A d2/d21/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	321	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	322	A d2/d21/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	323	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	324	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	325	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	326	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	327	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	328	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	329	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	330	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	331
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	332	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	333
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	334	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	335	$ mv d1/a d1/d11/a1 d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	336	$ hg rename --after 'glob:d1/**' d2/d21
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	337	moving d1/a to d2/d21/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	338	d1/b: not recording move - d2/d21/b does not exist (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	339	d1/ba: not recording move - d2/d21/ba does not exist (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	340	moving d1/d11/a1 to d2/d21/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	341	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	342	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	343	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	344	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	345	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	346	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	347	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	348	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	349	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	350	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	351
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	352	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	353
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	354	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	355	$ hg rename 're:d1/([^a][^/]/)a.*' d2/d21
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	356	moving d1/a to d2/d21/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	357	moving d1/d11/a1 to d2/d21/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	358	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	359	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	360	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	361	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	362	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	363	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	364	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	365	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	366	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	367	$ 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	368
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	369	attempt to overwrite an existing file
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	370
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	371	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	372	$ hg rename d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	373	d1/ca: not overwriting - file exists
30151 381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 25382 diff changeset	374	(hg rename --after to record the rename)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	375	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	376	? d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	377	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	378	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	379
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	380	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	381
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	382	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	383	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	384	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	385	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	386	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	387	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	388	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	389	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	390	$ rm d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	391
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	392	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	393
16902 7f1cec2f63ab test-rename.t: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 15447 diff changeset	394	#if symlink
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	395	$ ln -s ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	396	$ hg rename --traceback d1/ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	397	d1/ca: not overwriting - file exists
30151 381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 25382 diff changeset	398	(hg rename --after to record the rename)
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	399	$ hg status -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	400	? d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	401	$ hg update -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	402	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	403	$ rm d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	404
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	405	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	406
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	407	$ ln -s ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	408	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	409	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	410	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	411	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	412	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	413	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	414	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	415	$ rm d1/ca
16902 7f1cec2f63ab test-rename.t: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 15447 diff changeset	416	#endif
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	417
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	418	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	419
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	420	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	421	$ hg rename d1/* d2/* d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	422	moving d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	423	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	424	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	425	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	426	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	427	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	428	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	429	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	430	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	431	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	432	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	433	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	434	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	435	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	436	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	437	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	438	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	439	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	440
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	441	move a whole subtree with "hg rename ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	442
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	443	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	444	$ (cd d1; hg rename . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	445	moving a to ../d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	446	moving b to ../d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	447	moving ba to ../d3/d1/ba
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	448	moving d11/a1 to ../d3/d1/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	449	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	450	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	451	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	452	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	453	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	454	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	455	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	456	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	457	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	458	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	459	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	460	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	461	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	462	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	463	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	464	$ rm -rf d3
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	465
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	466	move a whole subtree with "hg rename --after ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	467
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	468	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	469	$ mv d1/* d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	470	$ (cd d1; hg rename --after . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	471	moving a to ../d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	472	moving b to ../d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	473	moving ba to ../d3/ba
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	474	moving d11/a1 to ../d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	475	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	476	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	477	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	478	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	479	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	480	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	481	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	482	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	483	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	484	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	485	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	486	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	487	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	488	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	489	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	490	$ rm -rf d3
1634 f49f602fae92 copy & rename can ignore removed source files Robin Farine <robin.farine@terminus.org> parents: 1633 diff changeset	491
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	492	move the parent tree with "hg rename .."
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	493
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	494	$ (cd d1/d11; hg rename .. ../../d3)
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	495	moving ../a to ../../d3/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	496	moving ../b to ../../d3/b (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	497	moving ../ba to ../../d3/ba (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	498	moving a1 to ../../d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	499	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	500	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	501	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	502	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	503	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	504	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	505	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	506	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	507	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	508	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	509	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	510	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	511	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	512	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	513	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	514	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	515
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	516	skip removed files
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	517
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	518	$ hg remove d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	519	$ hg rename d1 d3
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	520	moving d1/a to d3/a (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	521	moving d1/ba to d3/ba (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	522	moving d1/d11/a1 to d3/d11/a1 (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	523	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	524	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	525	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	526	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	527	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	528	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	529	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	530	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	531	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	532	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	533	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	534	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	535	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	536	$ rm -rf d3
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1747 diff changeset	537
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	538	transitive rename
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	539
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	540	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	541	$ hg rename d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	542	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	543	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	544	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	545	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	546	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	547	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	548	$ 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	549
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	550	transitive rename --after
10466 d1f209bb9564 patch: separate reverse copy data (issue1959) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8518 diff changeset	551
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	552	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	553	$ mv d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	554	$ hg rename --after d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	555	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	556	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	557	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	558	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	559	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	560	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	561	$ 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	562
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	563	$ 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	564	# 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	565	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	566	$ echo "some stuff added to d1/bb" >> d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	567	$ hg rename d1/bb d1/b
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	M d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	570	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	571	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	572
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	573	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	574
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	575	$ hg rename d1/a d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	576	$ hg rename d1/b d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	577	$ hg status -C
23402 2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	578	M d1/a
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	579	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	580	A d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	581	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	582	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	583	$ hg diff --git
23402 2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	584	diff --git a/d1/a b/d1/a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	585	--- a/d1/a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	586	+++ b/d1/a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	587	@@ -1,1 +1,1 @@
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	588	-d1/a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	589	+d1/b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	590	diff --git a/d1/b b/d1/b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	591	deleted file mode 100644
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	592	--- a/d1/b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	593	+++ /dev/null
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	594	@@ -1,1 +0,0 @@
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23401 diff changeset	595	-d1/b
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	596	diff --git a/d1/a b/d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	597	copy from d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	598	copy to d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	599	$ hg update -C
23401 fd1bab28a8cc manifest: fix a bug where working copy file 'add' mark was buggy Pierre-Yves David <pierre-yves.david@fb.com> parents: 18506 diff changeset	600	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
fd1bab28a8cc manifest: fix a bug where working copy file 'add' mark was buggy Pierre-Yves David <pierre-yves.david@fb.com> parents: 18506 diff changeset	601	$ rm d1/c # The file was marked as added, so 'hg update' action was 'forget'
1976 df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users. Thomas Arendsen Hein <thomas@intevation.de> parents: 1933 diff changeset	602
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	603	check illegal path components
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/foo
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	606	abort: path contains illegal component: .hg/foo (glob)
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 ../foo
18450 4f9a52858512 scmutil: localize and improve 'not under root' message Mads Kiilerich <madski@unity3d.com> parents: 17492 diff changeset	610	abort: ../foo not under root '$TESTTMP'
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/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	615	$ hg rename --after d1/d11/a1 .hg/foo
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	616	abort: path contains illegal component: .hg/foo (glob)
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/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	623
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	624	$ hg rename d1/d11/a1 .hg
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	625	abort: path contains illegal component: .hg/a1 (glob)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	626	[255]
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	627	$ hg --config extensions.largefiles= rename d1/d11/a1 .hg
33212 fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30151 diff changeset	628	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	629	abort: path contains illegal component: .hg/a1 (glob)
42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 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	$ hg rename d1/d11/a1 ..
18506 ef60083b5536 tests: fix for windows - slashes and no serve Mads Kiilerich <madski@unity3d.com> parents: 18450 diff changeset	633	abort: ../a1 not under root '$TESTTMP' (glob)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	634	[255]
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	635	$ hg --config extensions.largefiles= rename d1/d11/a1 ..
33212 fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30151 diff changeset	636	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	637	abort: ../a1 not under root '$TESTTMP' (glob)
42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	638	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	639	$ 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	640
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	641	$ mv d1/d11/a1 .hg
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	642	$ hg rename --after d1/d11/a1 .hg
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	643	abort: path contains illegal component: .hg/a1 (glob)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	644	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	645	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	646	! d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	647	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	648	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	649	$ 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	650
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	651	$ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15441 diff changeset	652	abort: path contains illegal component: .hg/foo (glob)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	653	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	654	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	655	$ (cd d1/d11; hg rename ../../d2/b ../../../foo)
18450 4f9a52858512 scmutil: localize and improve 'not under root' message Mads Kiilerich <madski@unity3d.com> parents: 17492 diff changeset	656	abort: ../../../foo not under root '$TESTTMP'
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	657	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	658	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	659

author	Anton Shestakov <av6@dwimlabs.net>
	Mon, 04 Dec 2017 18:26:54 +0800
changeset 35221	75f9f366e5cc
parent 33798	2cd5aba5e1d2
child 35393	4441705b7111
permissions	-rw-r--r--