Show More
@@ -1642,7 +1642,9 b' def copy(ui, repo, pats, opts, rename=Fa' | |||
|
1642 | 1642 | reltarget = repo.pathto(abstarget, cwd) |
|
1643 | 1643 | target = repo.wjoin(abstarget) |
|
1644 | 1644 | src = repo.wjoin(abssrc) |
|
1645 |
|
|
|
1645 | entry = repo.dirstate.get_entry(abstarget) | |
|
1646 | ||
|
1647 | already_commited = entry.tracked and not entry.added | |
|
1646 | 1648 | |
|
1647 | 1649 | scmutil.checkportable(ui, abstarget) |
|
1648 | 1650 | |
@@ -1672,9 +1674,9 b' def copy(ui, repo, pats, opts, rename=Fa' | |||
|
1672 | 1674 | exists = False |
|
1673 | 1675 | samefile = True |
|
1674 | 1676 | |
|
1675 |
if not after and exists or after and |
|
|
1677 | if not after and exists or after and already_commited: | |
|
1676 | 1678 | if not opts[b'force']: |
|
1677 |
if |
|
|
1679 | if already_commited: | |
|
1678 | 1680 | msg = _(b'%s: not overwriting - file already committed\n') |
|
1679 | 1681 | if after: |
|
1680 | 1682 | flags = b'--after --force' |
General Comments 0
You need to be logged in to leave comments.
Login now