diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-04-05 15:48:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-04-05 15:48:20 -0400 |
| commit | b07320e49423c2035c196ce301abbb26ec06196c (patch) | |
| tree | 7f44c69c65a5c91e3b0e547439e2e5b0c1e9765e | |
| parent | 06dee2f59f4d2df0ee61ab7f302e2f8a7440a815 (diff) | |
| parent | 9a7856d47e3ccd0eb97b242ee554e2841ee22cb5 (diff) | |
Merge commit 'jelmer/master'
Conflicts:
debian/changelog
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | commit.d/45bzr-precommit | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 2 insertions, 9 deletions
@@ -26,5 +26,3 @@ message Done for dpkg, but not for other package managers like rpm. - -* bzr: Somehow support etckeeper's pre-commit hook. diff --git a/commit.d/45bzr-precommit b/commit.d/45bzr-precommit deleted file mode 100755 index 3128c7a..0000000 --- a/commit.d/45bzr-precommit +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -if [ "$VCS" = bzr ] && [ -d .bzr ]; then - etckeeper precommit . -fi diff --git a/debian/changelog b/debian/changelog index 6ee0f56..471b14f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,13 +2,14 @@ etckeeper (0.15) UNRELEASED; urgency=low * Support for the new bzr pre-commit hook. This requires bzr version 1.4. (Jelmer Vernooij) + Closes: #473069 * bzr: Set nickname for tree in init.d/40vcs-init (Daniel Hahler) * Add script to add new files during "commit" for bzr (commit.d/30bzr-add). (Daniel Hahler) * Fix handling of files with spaces, by setting IFS to "newline" in commit.d/40bzr-rm and commit.d/40git-rm (Daniel Hahler) - -- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2008 14:39:10 -0400 + -- Jelmer Vernooij <jelmer@samba.org> Sat, 05 Apr 2008 20:59:44 +0200 etckeeper (0.14) unstable; urgency=low |