Mercurial: In vcs_reset(), the hg revert command was creating backups of files with names similar to ChangeLog.orig. The introduction of new files prevents a successful commit because the new file isn't included into the repository. Now we request that no backups be made when reverting a file.

This commit is contained in:
Nathan Phillip Brink 2010-09-15 01:38:17 -04:00
parent c8da172252
commit 0d1ac07ef7

View File

@ -187,7 +187,7 @@ vcs_reset() {
git checkout HEAD -- "${@}" 2>/dev/null || req rm -f -- "${@}"
elif [ ${SC_VCS} = hg ]; then
[ -n "$(hg status -au "${@}")" ] && req rm -f -- "${@}"
hg revert -- "${@}" 2>/dev/null
hg revert --no-backup -- "${@}" 2>/dev/null
elif [ ${SC_VCS} = svn ]; then
req rm -f -- "${@}"
svn revert -- "${@}" >/dev/null