Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rename.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Thu, 10 Jun 2010 11:49:48 +0200
changeset 11337 0f3c8a47960e
parent 11331 997ab9af81df
child 12342 70236d6fd844
permissions -rw-r--r--
debugbuilddag: build a changelog dag from a concise description Useful in tests to quickly build a complex DAG in an empty repo. Handles local tags and named branches. Options to, at each rev, - create a new file, - overwrite the same file, - append to the same file, - write to a specific line in a mergeable file. Can run shell commands during DAG buildup.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
11331
997ab9af81df summary: report copies and renames
Matt Mackall <mpm@selenic.com>
parents: 11223
diff changeset 
     2
 
parent: 0:6f9914c7a010 tip
997ab9af81df summary: report copies and renames
Matt Mackall <mpm@selenic.com>
parents: 11223
diff changeset 
     3
 
 1
997ab9af81df summary: report copies and renames
Matt Mackall <mpm@selenic.com>
parents: 11223
diff changeset 
     4
 
branch: default
997ab9af81df summary: report copies and renames
Matt Mackall <mpm@selenic.com>
parents: 11223
diff changeset 
     5
 
commit: 1 renamed
997ab9af81df summary: report copies and renames
Matt Mackall <mpm@selenic.com>
parents: 11223
diff changeset 
     6
 
update: (current)
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
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
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
     9
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    10
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    11
 
# rename --after a single file
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    12
 
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 
    13
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    14
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    15
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11223
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    16
 
# rename --after a single file when src and tgt already tracked
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    17
 
removing d1/d11/a1
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    18
 
adding d2/c
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    19
 
A d2/c
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    20
 
  d1/d11/a1
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    21
 
R d1/d11/a1
0d09f2244805 rename: make --after work if source is already in R state
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 11152
diff changeset 
    22
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11152
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents: 10466
diff changeset 
    23
 
# rename --after a single file to a nonexistant target filename
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents: 10466
diff changeset 
    24
 
d1/a: not recording move - dummy does not exist
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    25
 
# 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 
    26
 
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 
    27
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    28
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    29
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    30
 
# move --after a single file to an existing directory
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    31
 
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 
    32
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    33
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    34
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    35
 
# rename a file using a relative path
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    36
 
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 
    37
 
  d2/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    38
 
R d2/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    39
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    40
 
# rename --after a file using a relative path
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    41
 
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 
    42
 
  d2/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    43
 
R d2/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    44
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    45
 
# rename directory d1 as d3
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    46
 
moving d1/a to d3/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    47
 
moving d1/b to d3/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    48
 
moving d1/ba to d3/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    49
 
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 
    50
 
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 
    51
 
  d1/a
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    52
 
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 
    53
 
  d1/b
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    54
 
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 
    55
 
  d1/ba
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    56
 
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 
    57
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    58
 
R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    59
 
R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    60
 
R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    61
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    62
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    63
 
# rename --after directory d1 as d3
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    64
 
moving d1/a to d3/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    65
 
moving d1/b to d3/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    66
 
moving d1/ba to d3/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    67
 
moving d1/d11/a1 to d3/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    68
 
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 
    69
 
  d1/a
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    70
 
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 
    71
 
  d1/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    72
 
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 
    73
 
  d1/ba
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    74
 
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 
    75
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    76
 
R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    77
 
R d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    78
 
R d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    79
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    80
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    81
 
# move a directory using a relative path
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    82
 
moving ../d1/d11/a1 to d3/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    83
 
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 
    84
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    85
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    86
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    87
 
# move --after a directory using a relative path
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
    88
 
moving ../d1/d11/a1 to d3/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    89
 
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 
    90
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
    91
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    92
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    93
 
# 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 
    94
 
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 
    95
 
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 
    96
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    97
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
    98
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
    99
 
# 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 
   100
 
moving d1/a to d3/d1/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   101
 
moving d1/b to d3/d1/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   102
 
moving d1/ba to d3/d1/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   103
 
moving d1/d11/a1 to d3/d1/d11/a1
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   104
 
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 
   105
 
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 
   106
 
  d1/a
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   107
 
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 
   108
 
  d1/b
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   109
 
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 
   110
 
  d1/ba
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   111
 
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 
   112
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   113
 
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 
   114
 
  d2/b
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   115
 
R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   116
 
R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   117
 
R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   118
 
R d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   119
 
R d2/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   120
 
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   121
 
# 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 
   122
 
moving d1/a to d3/d1/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   123
 
moving d1/b to d3/d1/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   124
 
moving d1/ba to d3/d1/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   125
 
moving d1/d11/a1 to d3/d1/d11/a1
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   126
 
moving d2/b to d3/d2/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   127
 
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 
   128
 
  d1/a
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   129
 
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 
   130
 
  d1/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   131
 
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 
   132
 
  d1/ba
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   133
 
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 
   134
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   135
 
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 
   136
 
  d2/b
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   137
 
R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   138
 
R d1/b
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   139
 
R d1/ba
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   140
 
R d1/d11/a1
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   141
 
R d2/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   142
 
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   143
 
# 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 
   144
 
# 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 
   145
 
d2/b: not overwriting - file exists
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   146
 
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 
   147
 
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 
   148
 
  d1/a
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   149
 
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 
   150
 
  d1/ba
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   151
 
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 
   152
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   153
 
R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   154
 
R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   155
 
R d1/d11/a1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   156
 
1c1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   157
 
< d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   158
 
---
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   159
 
> d2/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   160
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
5329
7e6138cb8d38 copy: if destination ends with "/", make sure it's a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4742
diff changeset 
   161
 
# 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 
   162
 
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 
   163
 
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 
   164
 
# 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 
   165
 
# directory
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   166
 
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 
   167
 
# move every file under d1 to d2/d21 (glob)
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   168
 
moving d1/a to d2/d21/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   169
 
moving d1/b to d2/d21/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   170
 
moving d1/ba to d2/d21/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   171
 
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 
   172
 
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 
   173
 
  d1/a
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   174
 
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 
   175
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   176
 
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 
   177
 
  d1/b
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   178
 
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 
   179
 
  d1/ba
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   180
 
R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   181
 
R d1/b
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   182
 
R d1/ba
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   183
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   184
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   185
 
# 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 
   186
 
moving d1/a to d2/d21/a
11152
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents: 10466
diff changeset 
   187
 
d1/b: not recording move - d2/d21/b does not exist
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Steve Losh <steve@stevelosh.com>
parents: 10466
diff changeset 
   188
 
d1/ba: not recording move - d2/d21/ba does not exist
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   189
 
moving d1/d11/a1 to d2/d21/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   190
 
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 
   191
 
  d1/a
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   192
 
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 
   193
 
  d1/d11/a1
1565
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   194
 
R d1/a
4bcbc126b80b fix rename --after
Robin Farine <robin.farine@terminus.org>
parents: 1514
diff changeset 
   195
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   196
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   197
 
# 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 
   198
 
moving d1/a to d2/d21/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   199
 
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 
   200
 
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 
   201
 
  d1/a
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   202
 
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 
   203
 
  d1/d11/a1
1512
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   204
 
R d1/a
53ad6ee6ede4 generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
diff changeset 
   205
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   206
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1513
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset 
   207
 
# 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 
   208
 
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 
   209
 
? d1/ca
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset 
   210
 
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 
   211
 
# 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 
   212
 
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 
   213
 
  d1/ba
1513
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset 
   214
 
R d1/ba
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   215
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1513
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset 
   216
 
# 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 
   217
 
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 
   218
 
  d1/ba
1513
5c3b93b244aa copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents: 1512
diff changeset 
   219
 
R d1/ba
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   220
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1514
faf46d810a85 avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org>
parents: 1513
diff changeset 
   221
 
# 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 
   222
 
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 
   223
 
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 
   224
 
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 
   225
 
  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 
   226
 
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 
   227
 
  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 
   228
 
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 
   229
 
  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 
   230
 
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 
   231
 
  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 
   232
 
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 
   233
 
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 
   234
 
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 
   235
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   236
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   237
 
# move a whole subtree with "hg rename ."
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   238
 
moving a to ../d3/d1/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   239
 
moving b to ../d3/d1/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   240
 
moving ba to ../d3/d1/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   241
 
moving d11/a1 to ../d3/d1/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   242
 
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 
   243
 
  d1/a
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   244
 
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 
   245
 
  d1/b
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   246
 
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 
   247
 
  d1/ba
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   248
 
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 
   249
 
  d1/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   250
 
R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   251
 
R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   252
 
R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   253
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   254
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   255
 
# move a whole subtree with "hg rename --after ."
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   256
 
moving a to ../d3/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   257
 
moving b to ../d3/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   258
 
moving ba to ../d3/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   259
 
moving d11/a1 to ../d3/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   260
 
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 
   261
 
  d1/a
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   262
 
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 
   263
 
  d1/b
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   264
 
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 
   265
 
  d1/ba
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   266
 
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 
   267
 
  d1/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   268
 
R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   269
 
R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   270
 
R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   271
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   272
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   273
 
# move the parent tree with "hg rename .."
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   274
 
moving ../a to ../../d3/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   275
 
moving ../b to ../../d3/b
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   276
 
moving ../ba to ../../d3/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   277
 
moving a1 to ../../d3/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   278
 
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 
   279
 
  d1/a
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   280
 
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 
   281
 
  d1/b
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   282
 
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 
   283
 
  d1/ba
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   284
 
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 
   285
 
  d1/d11/a1
1633
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   286
 
R d1/a
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   287
 
R d1/b
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   288
 
R d1/ba
94c179a92f4a copy/rename '.' or '..' correctly
Robin Farine <robin.farine@terminus.org>
parents: 1565
diff changeset 
   289
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   290
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1634
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   291
 
# skip removed files
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   292
 
moving d1/a to d3/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   293
 
moving d1/ba to d3/ba
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5329
diff changeset 
   294
 
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 
   295
 
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 
   296
 
  d1/a
1634
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   297
 
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 
   298
 
  d1/ba
1634
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   299
 
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 
   300
 
  d1/d11/a1
1634
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   301
 
R d1/a
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   302
 
R d1/b
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   303
 
R d1/ba
f49f602fae92 copy & rename can ignore removed source files
Robin Farine <robin.farine@terminus.org>
parents: 1633
diff changeset 
   304
 
R d1/d11/a1
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   305
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1747
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   306
 
# transitive rename
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   307
 
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 
   308
 
  d1/b
1747
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   309
 
R d1/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   310
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1747
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   311
 
# transitive rename --after
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   312
 
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 
   313
 
  d1/b
1747
91c56c427171 transitive copy/rename
Robin Farine <robin.farine@terminus.org>
parents: 1634
diff changeset 
   314
 
R d1/b
8518
3f4f14eab085 update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5610
diff changeset 
   315
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1822
64df4220b349 copy/rename to a removed destination file
Robin Farine <robin.farine@terminus.org>
parents: 1747
diff changeset 
   316
 
# 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 
   317
 
M d1/b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset 
   318
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10466
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   319
 
# overwriting with renames (issue1959)
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   320
 
A d1/a
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   321
 
  d1/b
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   322
 
A d1/c
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   323
 
  d1/a
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   324
 
R d1/b
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   325
 
diff --git a/d1/b b/d1/a
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   326
 
rename from d1/b
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   327
 
rename to d1/a
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   328
 
diff --git a/d1/a b/d1/c
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   329
 
copy from d1/a
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   330
 
copy to d1/c
d1f209bb9564 patch: separate reverse copy data (issue1959)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 8518
diff changeset 
   331
 
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1976
df8416346bb7 Enable path validation for copy, rename, debugwalk and other canonpath users.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1822
diff changeset 
   332
 
# 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 
   333
 
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 
   334
 
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 
   335
 
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 
   336
 
! d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset 
   337
 
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 
   338
 
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 
   339
 
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 
   340
 
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 
   341
 
! d1/d11/a1
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1976
diff changeset 
   342
 
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 
   343
 
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 
   344
 
abort: ../../../foo not under root
Mercurial