mercurial: tests/test-rename.t@865efc020c33 (annotated)

49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	1	$ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	2	$ cd repo
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	3	$ mkdir d1 d1/d11 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	4	$ echo d1/a > d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	5	$ echo d1/ba > d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	6	$ echo d1/a1 > d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	7	$ echo d1/b > d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	8	$ echo d2/b > d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	9	$ 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	10	$ hg commit -m "1"
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	11
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	12	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	13
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	14	$ 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	15	$ 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	16	abort: filename contains 'con', which is reserved on Windows: d1/con.xml
45844 3175b0e0058b errors: use InputError for errors about bad paths Martin von Zweigbergk <martinvonz@google.com> parents: 45827 diff changeset	17	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	18	$ hg sum
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12098 diff changeset	19	parent: 0:9b4b6e7b2c26 tip
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	20	1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	21	branch: default
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	22	commit: 1 renamed
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	23	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25111 diff changeset	24	phases: 1 draft
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	25	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	26	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	27	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	28	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	29	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	30	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	31	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	32
12898 f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	33	rename a single file using absolute paths
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	34
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	35	$ 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	36	$ hg status -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	37	A d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	38	d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	39	R d1/d11/a1
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	40	$ hg update -C
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	41	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	42	$ rm d2/c
f2fd909053d9 test-rename: test with absolute paths Martin Geisler <mg@aragost.com> parents: 12897 diff changeset	43
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	44	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	45
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	46	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	47	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	48	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	49	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	50	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	51	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	52	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	53	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	54	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	55
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	56	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	57
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	58	$ mv d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	59	$ hg addrem -s 0
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	60	removing d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	61	adding d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	62	$ hg rename --after d1/d11/a1 d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	63	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	64	A d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	65	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	66	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	67	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	68	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	69	$ rm d2/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	70
17492 973c2b0b403c spelling: nonexistent timeless@mozdev.org parents: 16902 diff changeset	71	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	72
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	73	$ hg rename --after d1/a dummy
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	74	d1/a: not recording move - dummy does not exist
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	75	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	76
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	77	move a single file to an existing directory
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	78
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	79	$ hg rename d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	80	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	81	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	82	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	83	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	84	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	85	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	86	$ rm d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	87
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	88	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	89
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	90	$ mv d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	91	$ hg rename --after d1/d11/a1 d2
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	92	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	93	A d2/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	94	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	95	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	96	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	97	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	98	$ 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	99
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	100	rename a file using a relative path
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	101
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	102	$ (cd d1/d11; hg rename ../../d2/b e)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	103	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	104	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	105	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	106	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	107	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	108	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	109	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	110
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	111	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	112
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	113	$ (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	114	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	115	A d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	116	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	117	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	118	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	119	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	120	$ rm d1/d11/e
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	121
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	122	rename directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	123
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	124	$ hg rename d1/ d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	125	moving d1/a to d3/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	126	moving d1/b to d3/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	127	moving d1/ba to d3/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	128	moving d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	129	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	130	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	131	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	132	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	133	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	134	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	135	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	136	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	137	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	138	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	139	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	140	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	141	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	142	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	143	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	144	$ rm -rf 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	rename --after directory d1 as d3
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	147
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	148	$ mv d1 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	149	$ hg rename --after d1 d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	150	moving d1/a to d3/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	151	moving d1/b to d3/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	152	moving d1/ba to d3/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	153	moving d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	154	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	155	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	156	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	157	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	158	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	159	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	160	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	161	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	162	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	163	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	164	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	165	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	166	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	167	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	168	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	169	$ rm -rf d3
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	move a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	172
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	173	$ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	174	moving ../d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	175	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	176	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	177	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	178	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	179	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	180	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	181	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	182
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	183	move --after a directory using a relative path
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1515 diff changeset	184
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	185	$ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	186	moving ../d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	187	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	188	A d2/d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	189	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	190	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	191	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	192	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	193	$ rm -rf d2/d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	194
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	195	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	196
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	197	$ hg rename d1/d11/ d2
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	198	moving d1/d11/a1 to d2/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	199	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	200	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	201	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	202	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	203	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	204	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	205	$ rm -rf d2/d11
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	206
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	207	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	208
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	209	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	210	$ hg rename d1 d2 d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	211	moving d1/a to d3/d1/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	212	moving d1/b to d3/d1/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	213	moving d1/ba to d3/d1/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	214	moving d1/d11/a1 to d3/d1/d11/a1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	215	moving d2/b to d3/d2/b
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	216	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	217	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	218	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	219	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	220	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	221	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	222	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	223	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	224	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	225	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	226	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	227	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	228	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	229	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	230	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	231	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	232	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	233	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	234	$ rm -rf d3
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	235
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	236	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	237
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	238	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	239	$ mv d1 d2 d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	240	$ hg rename --after d1 d2 d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	241	moving d1/a to d3/d1/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	242	moving d1/b to d3/d1/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	243	moving d1/ba to d3/d1/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	244	moving d1/d11/a1 to d3/d1/d11/a1
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	245	moving d2/b to d3/d2/b
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	246	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	247	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	248	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	249	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	250	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	251	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	252	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	253	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	254	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	255	A d3/d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	256	d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	257	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	258	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	259	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	260	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	261	R d2/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	262	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	263	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	264	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	265
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	266	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	267	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	268
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	269	$ 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	270	d2/b: not overwriting - file already committed
39348 cde75233c415 rename: quote hg commands in warnings Martin von Zweigbergk <martinvonz@google.com> parents: 37088 diff changeset	271	('hg rename --force' to replace the file by recording a rename)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	272	moving d1/d11/a1 to d2/d11/a1
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	273	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	274	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	275	A d2/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	276	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	277	A d2/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	278	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	279	A d2/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	280	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	281	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	282	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	283	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	284	$ diff -u d1/b d2/b
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	285	--- d1/b * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	286	+++ d2/b * (glob)
12405 1f6abbd38783 test-rename: accept solaris diff Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	287	@@ * (glob)
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	288	-d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	289	+d2/b
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	290	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	291	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	292	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	293	$ 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	294
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	295	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	296
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	297	$ hg rename d1/a dx/
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	298	abort: destination dx/ is not a directory
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 39350 diff changeset	299	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	300	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	301	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	302	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	303
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	304	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	305
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	306	$ hg rename 'glob:d1/**' dx
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	307	abort: with multiple sources, destination must be an existing directory
45827 8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 39350 diff changeset	308	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	309
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	310	move every file under d1 to d2/d21
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	311
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	312	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	313	$ hg rename 'glob:d1/**' d2/d21
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	314	moving d1/a to d2/d21/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	315	moving d1/b to d2/d21/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	316	moving d1/ba to d2/d21/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	317	moving d1/d11/a1 to d2/d21/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	318	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	319	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	320	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	321	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	322	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	323	A d2/d21/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	324	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	325	A d2/d21/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	326	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	327	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	328	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	329	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	330	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	331	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	332	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	333	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	334
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	335	move --after some files under d1 to d2/d21
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: diff changeset	336
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	337	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	338	$ mv d1/a d1/d11/a1 d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	339	$ hg rename --after 'glob:d1/**' d2/d21
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	340	moving d1/a to d2/d21/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	341	d1/b: not recording move - d2/d21/b does not exist
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	342	d1/ba: not recording move - d2/d21/ba does not exist
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	343	moving d1/d11/a1 to d2/d21/a1
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	344	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	345	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	346	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	347	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	348	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	349	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	350	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	351	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	352	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	353	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	354	$ rm -rf d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	355
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	356	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	357
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	358	$ mkdir d2/d21
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	359	$ hg rename 're:d1/([^a][^/]/)a.*' d2/d21
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	360	moving d1/a to d2/d21/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	361	moving d1/d11/a1 to d2/d21/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	362	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	363	A d2/d21/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	364	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	365	A d2/d21/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	366	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	367	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	368	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	369	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	370	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	371	$ 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	372
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	373	attempt to overwrite an existing file
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	374
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	375	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	376	$ hg rename d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	377	d1/ca: not overwriting - file exists
39348 cde75233c415 rename: quote hg commands in warnings Martin von Zweigbergk <martinvonz@google.com> parents: 37088 diff changeset	378	('hg rename --after' to record the rename)
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	379	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	380	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	381	? d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	382	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	383	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	384
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	385	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	386
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	387	$ echo "ca" > d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	388	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	389	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	390	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	391	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	392	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	393	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	394	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	395	$ rm d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	396
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	397	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	398
16902 7f1cec2f63ab test-rename.t: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 15447 diff changeset	399	#if symlink
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	400	$ ln -s ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	401	$ hg rename --traceback d1/ba d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	402	d1/ca: not overwriting - file exists
39348 cde75233c415 rename: quote hg commands in warnings Martin von Zweigbergk <martinvonz@google.com> parents: 37088 diff changeset	403	('hg rename --after' to record the rename)
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	404	[1]
12345 e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	405	$ hg status -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	406	? d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	407	$ hg update -C
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	408	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	409	$ rm d1/ca
e0ee3e822a9a Merge with stable Patrick Mezard <pmezard@gmail.com> parents: 12342 12316 diff changeset	410
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	411	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	412
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	413	$ ln -s ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	414	$ hg rename --force d1/ba d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	415	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	416	A d1/ca
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	417	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	418	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	419	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	420	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	421	$ rm d1/ca
16902 7f1cec2f63ab test-rename.t: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 15447 diff changeset	422	#endif
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	423
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	424	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	425
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	426	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	427	$ hg rename d1/* d2/* d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	428	moving d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	429	d3/b: not overwriting - d2/b collides with d1/b
39350 5b92a717bfc1 rename: return error status if any rename/copy failed Martin von Zweigbergk <martinvonz@google.com> parents: 39348 diff changeset	430	[1]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	431	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	432	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	433	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	434	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	435	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	436	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	437	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	438	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	439	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	440	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	441	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	442	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	443	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	444	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	445	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	446	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	447
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	448	move a whole subtree with "hg rename ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	449
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	450	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	451	$ (cd d1; hg rename . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	452	moving a to ../d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	453	moving b to ../d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	454	moving ba to ../d3/d1/ba
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	455	moving d11/a1 to ../d3/d1/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	456	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	457	A d3/d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	458	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	459	A d3/d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	460	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	461	A d3/d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	462	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	463	A d3/d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	464	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	465	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	466	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	467	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	468	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	469	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	470	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	471	$ rm -rf d3
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	472
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	473	move a whole subtree with "hg rename --after ."
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1565 diff changeset	474
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	475	$ mkdir d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	476	$ mv d1/* d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	477	$ (cd d1; hg rename --after . ../d3)
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	478	moving a to ../d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	479	moving b to ../d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	480	moving ba to ../d3/ba
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	481	moving d11/a1 to ../d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	482	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	483	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	484	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	485	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	486	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	487	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	488	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	489	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	490	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	491	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	492	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	493	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	494	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	495	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	496	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	497	$ rm -rf d3
1634 f49f602fae92 copy & rename can ignore removed source files Robin Farine <robin.farine@terminus.org> parents: 1633 diff changeset	498
12897 81cdf836457e test-rename: fix \" -> " in comments Martin Geisler <mg@aragost.com> parents: 12405 diff changeset	499	move the parent tree with "hg rename .."
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	500
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	501	$ (cd d1/d11; hg rename .. ../../d3)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	502	moving ../a to ../../d3/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	503	moving ../b to ../../d3/b
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	504	moving ../ba to ../../d3/ba
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	505	moving a1 to ../../d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	506	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	507	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	508	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	509	A d3/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	510	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	511	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	512	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	513	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	514	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	515	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	516	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	517	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	518	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	519	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	520	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	521	$ rm -rf d3
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	522
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	523	skip removed files
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1634 diff changeset	524
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	525	$ hg remove d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	526	$ hg rename d1 d3
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	527	moving d1/a to d3/a
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	528	moving d1/ba to d3/ba
4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	529	moving d1/d11/a1 to d3/d11/a1
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	530	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	531	A d3/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	532	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	533	A d3/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	534	d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	535	A d3/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	536	d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	537	R d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	538	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	539	R d1/ba
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	540	R d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	541	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	542	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	543	$ rm -rf d3
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1747 diff changeset	544
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	545	transitive rename
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	546
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	547	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	548	$ hg rename d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	549	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	550	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	551	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	552	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	553	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	554	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	555	$ 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	556
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	557	transitive rename --after
10466 d1f209bb9564 patch: separate reverse copy data (issue1959) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8518 diff changeset	558
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	559	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	560	$ mv d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	561	$ hg rename --after d1/bb d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	562	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	563	A d1/bc
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	564	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	565	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	566	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	567	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	568	$ 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	569
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	570	$ 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	571	# 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	572	$ hg rename d1/b d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	573	$ echo "some stuff added to d1/bb" >> d1/bb
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	574	$ hg rename d1/bb d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	575	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	576	M d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	577	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	578	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	579
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	580	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	581
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	582	$ hg rename d1/a d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	583	$ hg rename d1/b d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	584	$ 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	585	M d1/a
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	586	d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	587	A d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	588	d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	589	R d1/b
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	590	$ 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	591	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	592	--- 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	593	+++ 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	594	@@ -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	595	-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	596	+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	597	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	598	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	599	--- 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	600	+++ /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	601	@@ -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	602	-d1/b
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	603	diff --git a/d1/a b/d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	604	copy from d1/a
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	605	copy to d1/c
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	606	$ 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	607	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	608	$ 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	609
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	610	check illegal path components
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	611
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	612	$ hg rename d1/d11/a1 .hg/foo
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	613	abort: path contains illegal component: .hg/foo
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	614	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	615	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	616	$ hg rename d1/d11/a1 ../foo
49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	617	abort: ../foo not under root '$TESTTMP/repo'
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	618	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	619	$ 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	620
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	621	$ mv d1/d11/a1 .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	622	$ hg rename --after d1/d11/a1 .hg/foo
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	623	abort: path contains illegal component: .hg/foo
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	624	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	625	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	626	! d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	627	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	628	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	629	$ rm .hg/foo
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	630
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	631	$ hg rename d1/d11/a1 .hg
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	632	abort: path contains illegal component: .hg/a1
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	633	[10]
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	634	$ 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	635	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	636	abort: path contains illegal component: .hg/a1
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	637	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	638	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	639	$ hg rename d1/d11/a1 ..
49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	640	abort: ../a1 not under root '$TESTTMP/repo'
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	641	[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	642	$ 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	643	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	644	abort: ../a1 not under root '$TESTTMP/repo'
24006 42fa7eeb858e largefiles: use the core file copy logic to validate the destination path Matt Harbison <matt_harbison@yahoo.com> parents: 23402 diff changeset	645	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	646	$ 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	647
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	648	$ mv d1/d11/a1 .hg
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	649	$ hg rename --after d1/d11/a1 .hg
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	650	abort: path contains illegal component: .hg/a1
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	651	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	652	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	653	! d1/d11/a1
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	654	$ hg update -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	655	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	656	$ 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	657
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	658	$ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33798 diff changeset	659	abort: path contains illegal component: .hg/foo
48369 35f1ecd84bd0 errors: use detailed exit code in pathauditor Martin von Zweigbergk <martinvonz@google.com> parents: 45844 diff changeset	660	[10]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	661	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	662	$ (cd d1/d11; hg rename ../../d2/b ../../../foo)
49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48879 diff changeset	663	abort: ../../../foo not under root '$TESTTMP/repo'
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	664	[255]
12098 12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	665	$ hg status -C
12108d7f2ce1 tests: unify test-rename Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11551 diff changeset	666
37088 08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	667	check that stat information such as mtime is preserved on rename - it's unclear
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	668	whether the `touch` and `stat` commands are portable, so we mimic them using
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	669	python. Not all platforms support precision of even one-second granularity, so
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	670	we allow a rather generous fudge factor here; 1234567890 is 2009, and the
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	671	primary thing we care about is that it's not the machine's current time;
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	672	hopefully it's really unlikely for a machine to have such a broken clock that
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	673	this test fails. :)
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	674
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	675	$ mkdir mtime
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	676	Create the file (as empty), then update its mtime and atime to be 1234567890.
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	677	>>> import os
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	678	>>> filename = "mtime/f"
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	679	>>> mtime = 1234567890
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	680	>>> open(filename, "w").close()
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	681	>>> os.utime(filename, (mtime, mtime))
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	682	$ hg ci -qAm 'add mtime dir'
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	683	"hg cp" does not preserve the mtime, so it should be newer than the 2009
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	684	timestamp.
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	685	$ hg cp -q mtime mtime_cp
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	686	>>> import os
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	687	>>> filename = "mtime_cp/f"
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	688	>>> print(os.stat(filename).st_mtime < 1234567999)
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	689	False
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	690	"hg mv" preserves the mtime, so it should be ~equal to the 2009 timestamp
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	691	(modulo some fudge factor due to not every system supporting 1s-level
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	692	precision).
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	693	$ hg mv -q mtime mtime_mv
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	694	>>> import os
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	695	>>> filename = "mtime_mv/f"
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	696	>>> print(os.stat(filename).st_mtime < 1234567999)
08890706366e copyfile: preserve stat info (mtime, etc.) when doing copies/renames Kyle Lippincott <spectral@google.com> parents: 35393 diff changeset	697	True

author	Arseniy Alekseyev <aalekseyev@janestreet.com>
	Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626	865efc020c33
parent 49621	55c6ebd11cb9
permissions	-rw-r--r--