Show More
@@ -470,7 +470,7 b' def copy(ui, repo, pats, opts, rename=Fa' | |||||
470 | if len(pats) == 1: |
|
470 | if len(pats) == 1: | |
471 | raise util.Abort(_('no destination specified')) |
|
471 | raise util.Abort(_('no destination specified')) | |
472 | dest = pats.pop() |
|
472 | dest = pats.pop() | |
473 | destdirexists = os.path.isdir(dest) |
|
473 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) | |
474 | if not destdirexists: |
|
474 | if not destdirexists: | |
475 | if len(pats) > 1 or util.patkind(pats[0], None)[0]: |
|
475 | if len(pats) > 1 or util.patkind(pats[0], None)[0]: | |
476 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
476 | raise util.Abort(_('with multiple sources, destination must be an ' |
@@ -38,3 +38,13 b" echo '% copies'" | |||||
38 | hg cp -v dangling dangling2 |
|
38 | hg cp -v dangling dangling2 | |
39 | hg st -Cmard |
|
39 | hg st -Cmard | |
40 | $TESTDIR/readlink.py dangling dangling2 |
|
40 | $TESTDIR/readlink.py dangling dangling2 | |
|
41 | ||||
|
42 | echo '% issue995' | |||
|
43 | hg up -C | |||
|
44 | mkdir dir | |||
|
45 | ln -s dir dirlink | |||
|
46 | hg ci -qAm 'add dirlink' | |||
|
47 | mkdir newdir | |||
|
48 | mv dir newdir/dir | |||
|
49 | mv dirlink newdir/dirlink | |||
|
50 | hg mv -A dirlink newdir/dirlink |
General Comments 0
You need to be logged in to leave comments.
Login now