Show More
@@ -741,13 +741,23 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
741 | 741 | actions[f] = ('g', (fl2, True), "remote created") |
|
742 | 742 | |
|
743 | 743 | for f in sorted(abortconflicts): |
|
744 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
744 | warn = repo.ui.warn | |
|
745 | if f in pathconflicts: | |
|
746 | if repo.wvfs.isfileorlink(f): | |
|
747 | warn(_("%s: untracked file conflicts with directory\n") % f) | |
|
748 | else: | |
|
749 | warn(_("%s: untracked directory conflicts with file\n") % f) | |
|
750 | else: | |
|
751 | warn(_("%s: untracked file differs\n") % f) | |
|
745 | 752 | if abortconflicts: |
|
746 | 753 | raise error.Abort(_("untracked files in working directory " |
|
747 | 754 | "differ from files in requested revision")) |
|
748 | 755 | |
|
749 | 756 | for f in sorted(warnconflicts): |
|
750 | repo.ui.warn(_("%s: replacing untracked file\n") % f) | |
|
757 | if repo.wvfs.isfileorlink(f): | |
|
758 | repo.ui.warn(_("%s: replacing untracked file\n") % f) | |
|
759 | else: | |
|
760 | repo.ui.warn(_("%s: replacing untracked files in directory\n") % f) | |
|
751 | 761 | |
|
752 | 762 | for f, (m, args, msg) in actions.iteritems(): |
|
753 | 763 | if m == 'c': |
@@ -30,7 +30,7 b" of the files in a commit we're updating " | |||
|
30 | 30 | |
|
31 | 31 | $ mkdir b && touch b/nonempty |
|
32 | 32 | $ hg up |
|
33 | b: untracked file differs | |
|
33 | b: untracked directory conflicts with file | |
|
34 | 34 | abort: untracked files in working directory differ from files in requested revision |
|
35 | 35 | [255] |
|
36 | 36 | $ hg ci |
@@ -37,7 +37,7 b' Basic update - local directory conflicts' | |||
|
37 | 37 | $ mkdir a |
|
38 | 38 | $ echo 3 > a/b |
|
39 | 39 | $ hg up file |
|
40 | a: untracked file differs | |
|
40 | a: untracked directory conflicts with file | |
|
41 | 41 | abort: untracked files in working directory differ from files in requested revision |
|
42 | 42 | [255] |
|
43 | 43 | $ hg up --clean file |
@@ -50,7 +50,7 b' make sure that this does not erase untra' | |||
|
50 | 50 | $ hg st |
|
51 | 51 | ? name/file |
|
52 | 52 | $ hg up 1 |
|
53 | name: untracked file differs | |
|
53 | name: untracked directory conflicts with file | |
|
54 | 54 | abort: untracked files in working directory differ from files in requested revision |
|
55 | 55 | [255] |
|
56 | 56 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now