Mercurial > hg
annotate tests/test-rename.out @ 11152:e8d10d085f47
cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Currently running 'hg rename --after foo.txt bar.typo' is a silent no-op. This patch adds a warning. It also updates the copy and rename tests.
No actual functionality is changed.
fixes issue 1822
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sat, 01 May 2010 18:39:40 -0400 |
parents | d1f209bb9564 |
children | 0d09f2244805 |
rev | line source |
---|---|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
1 # rename a single file |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
2 A d2/c |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
3 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
4 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
6 # rename --after a single file |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
7 A d2/c |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
8 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
9 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11152
e8d10d085f47
cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents:
10466
diff
changeset
|
11 # rename --after a single file to a nonexistant target filename |
e8d10d085f47
cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents:
10466
diff
changeset
|
12 d1/a: not recording move - dummy does not exist |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
13 # move a single file to an existing directory |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
14 A d2/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
15 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
16 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
18 # move --after a single file to an existing directory |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
19 A d2/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
20 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
21 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
23 # rename a file using a relative path |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
24 A d1/d11/e |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
25 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
26 R d2/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
28 # rename --after a file using a relative path |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
29 A d1/d11/e |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
30 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
31 R d2/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
33 # rename directory d1 as d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
34 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
35 moving d1/b to d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
36 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
37 moving d1/d11/a1 to d3/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
38 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
39 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
40 A d3/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
41 d1/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
42 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
43 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
44 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
45 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
46 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
47 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
48 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
49 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
50 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
51 # rename --after directory d1 as d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
52 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
53 moving d1/b to d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
54 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
55 moving d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
56 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
57 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
58 A d3/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
59 d1/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
60 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
61 d1/ba |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
62 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
63 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
64 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
65 R d1/b |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
66 R d1/ba |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
67 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
68 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
69 # move a directory using a relative path |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
70 moving ../d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
71 A d2/d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
72 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
73 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
75 # move --after a directory using a relative path |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
76 moving ../d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
77 A d2/d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
78 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
79 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
81 # move directory d1/d11 to an existing directory d2 (removes empty d1) |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
82 moving d1/d11/a1 to d2/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
83 A d2/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
84 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
85 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
87 # move directories d1 and d2 to a new directory d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
88 moving d1/a to d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
89 moving d1/b to d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
90 moving d1/ba to d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
91 moving d1/d11/a1 to d3/d1/d11/a1 |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
92 moving d2/b to d3/d2/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
93 A d3/d1/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
94 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
95 A d3/d1/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
96 d1/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
97 A d3/d1/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
98 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
99 A d3/d1/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
100 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
101 A d3/d2/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
102 d2/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
103 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
104 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
105 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
106 R d1/d11/a1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
107 R d2/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
108 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
109 # move --after directories d1 and d2 to a new directory d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
110 moving d1/a to d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
111 moving d1/b to d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
112 moving d1/ba to d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
113 moving d1/d11/a1 to d3/d1/d11/a1 |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
114 moving d2/b to d3/d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
115 A d3/d1/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
116 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
117 A d3/d1/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
118 d1/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
119 A d3/d1/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
120 d1/ba |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
121 A d3/d1/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
122 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
123 A d3/d2/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
124 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
125 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
126 R d1/b |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
127 R d1/ba |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
128 R d1/d11/a1 |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
129 R d2/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
130 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
131 # move everything under directory d1 to existing directory d2, do not |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
132 # overwrite existing files (d2/b) |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
133 d2/b: not overwriting - file exists |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
134 moving d1/d11/a1 to d2/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
135 A d2/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
136 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
137 A d2/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
138 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
139 A d2/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
140 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
141 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
142 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
143 R d1/d11/a1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
144 1c1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
145 < d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
146 --- |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
147 > d2/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
148 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
149 # attempt to move one file into a non-existent directory |
7e6138cb8d38
copy: if destination ends with "/", make sure it's a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4742
diff
changeset
|
150 abort: destination dx/ is not a directory |
7e6138cb8d38
copy: if destination ends with "/", make sure it's a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4742
diff
changeset
|
151 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
152 # attempt to move potentially more than one file into a non-existent |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
153 # directory |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
154 abort: with multiple sources, destination must be an existing directory |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
155 # move every file under d1 to d2/d21 (glob) |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
156 moving d1/a to d2/d21/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
157 moving d1/b to d2/d21/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
158 moving d1/ba to d2/d21/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
159 moving d1/d11/a1 to d2/d21/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
160 A d2/d21/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
161 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
162 A d2/d21/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
163 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
164 A d2/d21/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
165 d1/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
166 A d2/d21/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
167 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
168 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
169 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
170 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
171 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
172 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
173 # move --after some files under d1 to d2/d21 (glob) |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
174 moving d1/a to d2/d21/a |
11152
e8d10d085f47
cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents:
10466
diff
changeset
|
175 d1/b: not recording move - d2/d21/b does not exist |
e8d10d085f47
cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents:
10466
diff
changeset
|
176 d1/ba: not recording move - d2/d21/ba does not exist |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
177 moving d1/d11/a1 to d2/d21/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
178 A d2/d21/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
179 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
180 A d2/d21/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
181 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
182 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
183 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
184 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
185 # move every file under d1 starting with an 'a' to d2/d21 (regexp) |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
186 moving d1/a to d2/d21/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
187 moving d1/d11/a1 to d2/d21/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
188 A d2/d21/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
189 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
190 A d2/d21/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
191 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
192 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
193 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
194 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
195 # attempt to overwrite an existing file |
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
196 d1/ca: not overwriting - file exists |
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
197 ? d1/ca |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
198 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
199 # forced overwrite of an existing file |
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
200 A d1/ca |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
201 d1/ba |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
202 R d1/ba |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
204 # replace a symlink with a file |
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
205 A d1/ca |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
206 d1/ba |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
207 R d1/ba |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
209 # do not copy more than one source file to the same destination file |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
210 moving d1/d11/a1 to d3/d11/a1 |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
211 d3/b: not overwriting - d2/b collides with d1/b |
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
212 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
213 d1/a |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
214 A d3/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
215 d1/b |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
216 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
217 d1/ba |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
218 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
219 d1/d11/a1 |
1514
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
220 R d1/a |
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
221 R d1/b |
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
222 R d1/ba |
faf46d810a85
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents:
1513
diff
changeset
|
223 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
224 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
225 # move a whole subtree with "hg rename ." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
226 moving a to ../d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
227 moving b to ../d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
228 moving ba to ../d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
229 moving d11/a1 to ../d3/d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
230 A d3/d1/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
231 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
232 A d3/d1/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
233 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
234 A d3/d1/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
235 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
236 A d3/d1/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
237 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
238 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
239 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
240 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
241 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
242 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
243 # move a whole subtree with "hg rename --after ." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
244 moving a to ../d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
245 moving b to ../d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
246 moving ba to ../d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
247 moving d11/a1 to ../d3/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
248 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
249 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
250 A d3/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
251 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
252 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
253 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
254 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
255 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
256 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
257 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
258 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
259 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
260 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
261 # move the parent tree with "hg rename .." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
262 moving ../a to ../../d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
263 moving ../b to ../../d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
264 moving ../ba to ../../d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
265 moving a1 to ../../d3/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
266 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
267 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
268 A d3/b |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
269 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
270 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
271 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
272 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
273 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
274 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
275 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
276 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
277 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
278 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
279 # skip removed files |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
280 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
281 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
282 moving d1/d11/a1 to d3/d11/a1 |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
283 A d3/a |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
284 d1/a |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
285 A d3/ba |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
286 d1/ba |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
287 A d3/d11/a1 |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
288 d1/d11/a1 |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
289 R d1/a |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
290 R d1/b |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
291 R d1/ba |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
292 R d1/d11/a1 |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
293 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
294 # transitive rename |
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
295 A d1/bc |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
296 d1/b |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
297 R d1/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
298 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
299 # transitive rename --after |
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
300 A d1/bc |
4742
438603c1eb6f
test-rename: use hg status -C; don't use hg debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4533
diff
changeset
|
301 d1/b |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
302 R d1/b |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5610
diff
changeset
|
303 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1822
64df4220b349
copy/rename to a removed destination file
Robin Farine <robin.farine@terminus.org>
parents:
1747
diff
changeset
|
304 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) |
64df4220b349
copy/rename to a removed destination file
Robin Farine <robin.farine@terminus.org>
parents:
1747
diff
changeset
|
305 M d1/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10466
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
307 # overwriting with renames (issue1959) |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
308 A d1/a |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
309 d1/b |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
310 A d1/c |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
311 d1/a |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
312 R d1/b |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
313 diff --git a/d1/b b/d1/a |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
314 rename from d1/b |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
315 rename to d1/a |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
316 diff --git a/d1/a b/d1/c |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
317 copy from d1/a |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
318 copy to d1/c |
d1f209bb9564
patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8518
diff
changeset
|
319 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1976
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
320 # check illegal path components |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
321 abort: path contains illegal component: .hg/foo |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
322 abort: ../foo not under root |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
323 abort: path contains illegal component: .hg/foo |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
324 ! d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1976
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
326 abort: path contains illegal component: .hg/a1 |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
327 abort: ../a1 not under root |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
328 abort: path contains illegal component: .hg/a1 |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
329 ! d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1976
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
331 abort: path contains illegal component: .hg/foo |
df8416346bb7
Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1822
diff
changeset
|
332 abort: ../../../foo not under root |