Mercurial > hg
annotate tests/test-rename.out @ 6520:ba0b2dacc623
fix import with -p0
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 12 Apr 2008 22:41:07 -0400 |
parents | 2493a478f395 |
children | 3f4f14eab085 |
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 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
5 1 files updated, 0 files merged, 1 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 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
10 1 files updated, 0 files merged, 1 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
|
11 # 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
|
12 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
|
13 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
14 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
15 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
16 # move --after a single file to an existing directory |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
17 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
|
18 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
19 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
21 # rename a file using a relative path |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
22 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
|
23 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
24 R d2/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
25 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
26 # rename --after a file using a relative path |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
27 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
|
28 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
29 R d2/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
30 1 files updated, 0 files merged, 1 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
|
31 # rename directory d1 as d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
32 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
33 moving d1/b to d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
34 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
35 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
|
36 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
|
37 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
38 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
|
39 d1/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
40 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
|
41 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
42 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
|
43 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
44 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
45 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
46 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
47 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
48 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
49 # rename --after directory d1 as d3 |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
50 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
51 moving d1/b to d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
52 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
53 moving d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
54 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
|
55 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
56 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
|
57 d1/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
58 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
|
59 d1/ba |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
60 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
|
61 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
62 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
63 R d1/b |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
64 R d1/ba |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
65 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
66 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
67 # move a directory using a relative path |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
68 moving ../d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
69 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
|
70 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
71 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
73 # move --after a directory using a relative path |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
74 moving ../d1/d11/a1 to d3/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
75 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
|
76 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
77 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
78 1 files updated, 0 files merged, 1 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
|
79 # 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
|
80 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
|
81 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
|
82 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
83 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
84 1 files updated, 0 files merged, 1 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
|
85 # 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
|
86 moving d1/a to d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
87 moving d1/b to d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
88 moving d1/ba to d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
89 moving d1/d11/a1 to d3/d1/d11/a1 |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
90 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
|
91 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
|
92 d1/a |
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/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
|
94 d1/b |
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/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
|
96 d1/ba |
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/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
|
98 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
99 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
|
100 d2/b |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
101 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
102 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
103 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
104 R d1/d11/a1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
105 R d2/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
106 5 files updated, 0 files merged, 5 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
107 # 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
|
108 moving d1/a to d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
109 moving d1/b to d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
110 moving d1/ba to d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
111 moving d1/d11/a1 to d3/d1/d11/a1 |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
112 moving d2/b to d3/d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
113 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
|
114 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
115 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
|
116 d1/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
117 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
|
118 d1/ba |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
119 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
|
120 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
121 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
|
122 d2/b |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
123 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
124 R d1/b |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
125 R d1/ba |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
126 R d1/d11/a1 |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
127 R d2/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
128 5 files updated, 0 files merged, 5 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
|
129 # 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
|
130 # 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
|
131 d2/b: not overwriting - file exists |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
132 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
|
133 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
|
134 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
135 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
|
136 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
137 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
|
138 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
139 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
140 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
141 R d1/d11/a1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
142 1c1 |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
143 < d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
144 --- |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
145 > d2/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
146 3 files updated, 0 files merged, 3 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
|
147 # 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
|
148 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
|
149 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
|
150 # 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
|
151 # directory |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
152 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
|
153 # move every file under d1 to d2/d21 (glob) |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
154 moving d1/a to d2/d21/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
155 moving d1/b to d2/d21/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
156 moving d1/ba to d2/d21/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
157 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
|
158 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
|
159 d1/a |
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/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
|
161 d1/d11/a1 |
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/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
|
163 d1/b |
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/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
|
165 d1/ba |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
166 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
167 R d1/b |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
168 R d1/ba |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
169 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
170 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
171 # 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
|
172 moving d1/a to d2/d21/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
173 moving d1/d11/a1 to d2/d21/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
174 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
|
175 d1/a |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
176 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
|
177 d1/d11/a1 |
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
178 R d1/a |
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1514
diff
changeset
|
179 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
180 2 files updated, 0 files merged, 2 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
|
181 # 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
|
182 moving d1/a to d2/d21/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
183 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
|
184 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
|
185 d1/a |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
186 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
|
187 d1/d11/a1 |
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
188 R d1/a |
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff
changeset
|
189 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
190 2 files updated, 0 files merged, 2 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
|
191 # 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
|
192 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
|
193 ? d1/ca |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
194 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
|
195 # 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
|
196 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
|
197 d1/ba |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
198 R d1/ba |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
199 1 files updated, 0 files merged, 1 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
|
200 # 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
|
201 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
|
202 d1/ba |
1513
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
203 R d1/ba |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
204 1 files updated, 0 files merged, 1 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
|
205 # 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
|
206 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
|
207 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
|
208 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
|
209 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
|
210 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
|
211 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
|
212 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
|
213 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
|
214 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
|
215 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
|
216 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
|
217 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
|
218 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
|
219 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
220 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
221 # move a whole subtree with "hg rename ." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
222 moving a to ../d3/d1/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
223 moving b to ../d3/d1/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
224 moving ba to ../d3/d1/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
225 moving d11/a1 to ../d3/d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
226 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
|
227 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
228 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
|
229 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
230 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
|
231 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
232 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
|
233 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
234 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
235 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
236 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
237 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
238 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
239 # move a whole subtree with "hg rename --after ." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
240 moving a to ../d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
241 moving b to ../d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
242 moving ba to ../d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
243 moving d11/a1 to ../d3/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
244 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
|
245 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
246 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
|
247 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
248 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
|
249 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
250 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
|
251 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
252 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
253 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
254 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
255 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
256 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
257 # move the parent tree with "hg rename .." |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
258 moving ../a to ../../d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
259 moving ../b to ../../d3/b |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
260 moving ../ba to ../../d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
261 moving a1 to ../../d3/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
262 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
|
263 d1/a |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
264 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
|
265 d1/b |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
266 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
|
267 d1/ba |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
268 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
|
269 d1/d11/a1 |
1633
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
270 R d1/a |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
271 R d1/b |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
272 R d1/ba |
94c179a92f4a
copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents:
1565
diff
changeset
|
273 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
274 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
275 # skip removed files |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
276 moving d1/a to d3/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
277 moving d1/ba to d3/ba |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5329
diff
changeset
|
278 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
|
279 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
|
280 d1/a |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
281 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
|
282 d1/ba |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
283 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
|
284 d1/d11/a1 |
1634
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
285 R d1/a |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
286 R d1/b |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
287 R d1/ba |
f49f602fae92
copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents:
1633
diff
changeset
|
288 R d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
289 4 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
290 # transitive rename |
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
291 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
|
292 d1/b |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
293 R d1/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
294 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
295 # transitive rename --after |
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
296 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
|
297 d1/b |
1747
91c56c427171
transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents:
1634
diff
changeset
|
298 R d1/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
299 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1822
64df4220b349
copy/rename to a removed destination file
Robin Farine <robin.farine@terminus.org>
parents:
1747
diff
changeset
|
300 # 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
|
301 M d1/b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
302 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
|
303 # 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
|
304 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
|
305 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
|
306 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
|
307 ! d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
308 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
|
309 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
|
310 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
|
311 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
|
312 ! d1/d11/a1 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1976
diff
changeset
|
313 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
|
314 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
|
315 abort: ../../../foo not under root |