From 0d1ac07ef7f29fe203d9204247df4e224ecf3d01 Mon Sep 17 00:00:00 2001 From: Nathan Phillip Brink Date: Wed, 15 Sep 2010 01:38:17 -0400 Subject: [PATCH] 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. --- sunrise-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunrise-commit b/sunrise-commit index bb07f62..53bfec6 100755 --- a/sunrise-commit +++ b/sunrise-commit @@ -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