Package: gitpkg
Version: 0.5
Severity: minor
Currently git-debimport only merges the branches together for the last
version. This patch will merge the upstream into debian before
applying the .diff.gz.
As a result, the commit for the .diff.gz only contains the changes to
the debian metadata.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (900, 'unstable'), (300, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-x60s (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-- no debconf information
--- git-debimport.orig 2008-02-27 20:18:27.000000000 +0100
+++ git-debimport.merge 2008-02-27 20:18:45.000000000 +0100
@@ -176,6 +176,7 @@
echo "Importing $f"
git checkout "$DEBIAN_BRANCH"
+ git merge $(sanitise_git_ref "$UPSTREAM_TAG_PREFIX$UPSTREAM_VERSION")
for i in $(ls -A); do
if [ "$i" != ".git" ]; then rm -rf $i; fi
done
@@ -200,7 +201,7 @@
done
rm -rf "$CACHE_DIR"
-git merge -s ours "$UPSTREAM_BRANCH"
+git merge "$UPSTREAM_BRANCH"
echo "All done!"
