summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rwxr-xr-xunclean.d/50test2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b38addd..bf879da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+etckeeper (0.63) UNRELEASED; urgency=low
+
+ * bzr: Improve detection of unclean repos, to work when there are shelved
+ changes.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Apr 2012 13:37:53 -0400
+
etckeeper (0.62) unstable; urgency=low
* Autocommit git staged files. Closes: #662614
diff --git a/unclean.d/50test b/unclean.d/50test
index 173d6e2..e52003f 100755
--- a/unclean.d/50test
+++ b/unclean.d/50test
@@ -6,7 +6,7 @@ if [ "$VCS" = git ]; then
elif [ "$VCS" = hg ]; then
[ -d .hg ] && ! hg status 2>&1 | wc -l | grep -q "^0$"
elif [ "$VCS" = bzr ]; then
- [ -d .bzr ] && ! bzr status 2>/dev/null | wc -l | grep -q "^0$"
+ [ -d .bzr ] && ! bzr version-info --custom --template="{clean}\n" | grep -q "^1$"
elif [ "$VCS" = darcs ]; then
[ -d _darcs ] && darcs whatsnew -l >/dev/null
fi