Package: git-buildpackage Version: 0.6.22 Hello,
We use git-buildpackage to maintain the systemd Debian package. I was just trying to import a new upstream version into the experimental branch, which fails: $ git-import-orig --uscan gbp:info: Launching uscan... gbp:info: using ../systemd_219.orig.tar.xz What is the upstream version? [219] gbp:info: Importing '../systemd_219.orig.tar.xz' to branch 'upstream'... gbp:info: Source package is systemd gbp:info: Upstream version is 219 pristine-tar: committed systemd_219.orig.tar.xz.delta to branch pristine-tar gbp:info: Merging to 'experimental' gbp:error: Merge failed, please resolve. (debian/gbp.conf has "debian-branch = experimental", so that's corrrect). Now "git status" shows a huge unresolved mess. http://paste.debian.net/150285/ has the full output, but it looks like this: | Changes to be committed: | | modified: README | modified: catalog/systemd.catalog | modified: catalog/systemd.fr.catalog | new file: catalog/systemd.pt_BR.catalog | [...] These are alright. | Unmerged paths: | (use "git add/rm <file>..." as appropriate to mark resolution) | | both modified: Makefile-man.am | both modified: Makefile.am | both modified: Makefile.in | both modified: NEWS | both modified: TODO | both added: catalog/systemd.pl.catalog | both modified: config.h.in (lots more) | Untracked files: | (use "git add <file>..." to include in what will be committed) | | src/analyze/analyze-verify.h~HEAD | src/analyze/analyze-verify.h~upstream_219 | src/resolve/dns-type.c~HEAD (lots more) Before the import-orig, experimental and upstream branches were identical (except for debian/ of course). I'll resolve these manually (i. e. rm everything, unpack the tarball, then git add everything), so the branch on alioth will probably be ahead when you look at this, so I tar'ed up the local checkout and put it on https://people.debian.org/~mpitt/tmp/systemd-gbp.tar.xz The original tarball is http://www.freedesktop.org/software/systemd/systemd-219.tar.xz (same error with git-import-orig systemd-219.tar.xz) Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
