Mercurial > hg > pyhgsh

annotate tests/test-rename.out @ 2287:3f18d1eea370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update debugindexdot to work with RevlogNG.
author Samuel Masham <samuel.masham@gmail.com>
date Mon, 15 May 2006 08:53:32 -0700
parents b2ae81a7df29
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
3 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
4 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
5 # rename --after a single file
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
6 A d2/c
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
7 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
8 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
9 # 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
10 A d2/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
11 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
12 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
13 # move --after a single file to an existing directory
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
14 A d2/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
15 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
16 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
17 # rename a file using a relative path
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
18 A d1/d11/e
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
19 R d2/b
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 --after 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
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
23 R d2/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
24 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
25 # rename directory d1 as d3
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
26 copying d1/a to d3/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
27 copying d1/b to d3/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
28 copying d1/ba to d3/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
29 copying d1/d11/a1 to d3/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
30 removing d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
31 removing d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
32 removing d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
33 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
34 A d3/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
35 A d3/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
36 A d3/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
37 A d3/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
38 R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
39 R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
40 R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
41 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
42 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
43 # rename --after directory d1 as d3
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
44 copying d1/a to d3/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
45 copying d1/b to d3/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
46 copying d1/ba to d3/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
47 copying d1/d11/a1 to d3/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
48 removing d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
49 removing d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
50 removing d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
51 removing d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
52 A d3/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
53 A d3/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
54 A d3/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
55 A d3/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
56 R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
57 R d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
58 R d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
59 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
60 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
61 # move a directory using a relative path
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
62 copying ../d1/d11/a1 to d3/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
63 removing ../d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
64 A d2/d3/d11/a1
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 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
67 # move --after a directory using a relative path
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
68 copying ../d1/d11/a1 to d3/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
69 removing ../d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
70 A d2/d3/d11/a1
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
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
73 # move directory d1/d11 to an existing directory d2 (removes empty d1)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
74 copying d1/d11/a1 to d2/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
75 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
76 A d2/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
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 directories d1 and d2 to a new directory d3
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
80 copying d1/a to d3/d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
81 copying d1/b to d3/d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
82 copying d1/ba to d3/d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
83 copying d1/d11/a1 to d3/d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
84 copying d2/b to d3/d2/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
85 removing d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
86 removing d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
87 removing d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
88 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
89 removing d2/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
90 A d3/d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
91 A d3/d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
92 A d3/d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
93 A d3/d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
94 A d3/d2/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
95 R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
96 R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
97 R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
98 R d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
99 R d2/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
100 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
101 # move --after directories d1 and d2 to a new directory d3
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
102 copying d1/a to d3/d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
103 copying d1/b to d3/d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
104 copying d1/ba to d3/d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
105 copying d1/d11/a1 to d3/d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
106 copying d2/b to d3/d2/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
107 removing d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
108 removing d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
109 removing d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
110 removing d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
111 removing d2/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
112 A d3/d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
113 A d3/d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
114 A d3/d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
115 A d3/d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
116 A d3/d2/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
117 R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
118 R d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
119 R d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
120 R d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
121 R d2/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
122 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
123 # 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
124 # 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
125 d2/b: not overwriting - file exists
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
126 copying d1/d11/a1 to d2/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
127 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
128 A d2/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
129 A d2/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
130 A d2/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
131 R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
132 R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
133 R d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
134 1c1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
135 < d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
136 ---
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
137 > d2/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
138 3 files updated, 0 files merged, 3 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
139 # 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
140 # directory
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
141 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
142 # move every file under d1 to d2/d21 (glob)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
143 copying d1/a to d2/d21/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
144 copying d1/b to d2/d21/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
145 copying d1/ba to d2/d21/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
146 copying d1/d11/a1 to d2/d21/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
147 removing d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
148 removing d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
149 removing d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
150 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
151 A d2/d21/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
152 A d2/d21/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
153 A d2/d21/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
154 A d2/d21/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
155 R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
156 R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
157 R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
158 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
159 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
160 # move --after some files under d1 to d2/d21 (glob)
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
161 copying d1/a to d2/d21/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
162 copying d1/d11/a1 to d2/d21/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
163 removing d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
164 removing d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
165 A d2/d21/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
166 A d2/d21/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
167 R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset
168 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
169 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
170 # move every file under d1 starting with an 'a' to d2/d21 (regexp)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
171 copying d1/a to d2/d21/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
172 copying d1/d11/a1 to d2/d21/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
173 removing d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
174 removing d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
175 A d2/d21/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
176 A d2/d21/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
177 R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset
178 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
179 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
180 # 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
181 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
182 ? d1/ca
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
183 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
184 # 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
185 A d1/ca
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset
186 R d1/ba
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
187 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
188 # 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
189 A d1/ca
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset
190 R d1/ba
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
191 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
192 # do not copy more than one source file to the same destination file
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
193 copying d1/d11/a1 to d3/d11/a1
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
194 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
195 removing d1/d11/a1
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
196 A d3/a
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
197 A d3/b
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
198 A d3/ba
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
199 A d3/d11/a1
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset
200 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
201 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
202 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
203 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
204 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
205 # move a whole subtree with "hg rename ."
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
206 copying a to ../d3/d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
207 copying b to ../d3/d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
208 copying ba to ../d3/d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
209 copying d11/a1 to ../d3/d1/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
210 removing a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
211 removing b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
212 removing ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
213 removing d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
214 A d3/d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
215 A d3/d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
216 A d3/d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
217 A d3/d1/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
218 R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
219 R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
220 R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
221 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
222 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
223 # move a whole subtree with "hg rename --after ."
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
224 copying a to ../d3/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
225 copying b to ../d3/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
226 copying ba to ../d3/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
227 copying d11/a1 to ../d3/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
228 removing a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
229 removing b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
230 removing ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
231 removing d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
232 A d3/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
233 A d3/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
234 A d3/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
235 A d3/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
236 R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
237 R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
238 R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
239 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
240 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
241 # move the parent tree with "hg rename .."
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
242 copying ../a to ../../d3/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
243 copying ../b to ../../d3/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
244 copying ../ba to ../../d3/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
245 copying a1 to ../../d3/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
246 removing ../a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
247 removing ../b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
248 removing ../ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
249 removing a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
250 A d3/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
251 A d3/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
252 A d3/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
253 A d3/d11/a1
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
254 R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
255 R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
256 R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset
257 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
258 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
259 # skip removed files
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
260 copying d1/a to d3/a
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
261 copying d1/ba to d3/ba
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
262 copying d1/d11/a1 to d3/d11/a1
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
263 removing d1/a
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
264 removing d1/ba
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
265 removing d1/d11/a1
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
266 A d3/a
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
267 A d3/ba
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
268 A d3/d11/a1
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
269 R d1/a
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
270 R d1/b
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
271 R d1/ba
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset
272 R d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
273 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
274 # transitive rename
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset
275 A d1/bc
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset
276 R d1/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
277 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
278 # transitive rename --after
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset
279 A d1/bc
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset
280 R d1/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
281 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
282 # 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
283 M d1/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
284 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
285 # 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
286 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
287
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset
288 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
289 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
290
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset
291 ! d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset
292 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
293 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
294
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset
295 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
296 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
297
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset
298 ! d1/d11/a1
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, 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
300 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
301
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset
302 abort: ../../../foo not under root