Package: git-svn Version: 1:1.6.3.3-2 Severity: normal Strange, this one.
Short Summary:
I try to clone an SVN repository which had the
following sequence of events occur:
* create a branch from trunk
* various branch commits
* merge the branch from trunk
* various trunk commits
* delete the (now merged) branch
The resulting git repository's master branch does not
contain the "various trunk commits".
Detail:
The top commit for the package I wish to import is SVN r10006:
$ svn log svn://svn.debian.org/svn/pkg-games/packages/trunk/freedoom
------------------------------------------------------------------------
r10006 | jmtd | 2009-07-11 12:35:35 +0100 (Sat, 11 Jul 2009) | 1 line
correct path in wrapper
<SNIP>
But when I clone using the following
$ git svn clone --authors-file=authors.txt --no-metadata \
svn://svn.debian.org/svn/pkg-games/packages \
--trunk=/trunk/freedoom --branches=/branches/freedoom \
--tags=/tags/freedoom freedoom.git.20090914
<SNIP>
The top commit message is different:
$ cd freedoom.git.20090914
$ git log
commit 966570b126cd71b7135223f1cb54888c0391093f
Author: Jon Dowland <[email protected]>
Date: Mon Jul 6 08:27:52 2009 +0000
quieten update-alternatives
<SNIP>
This commit message originates on a SVN branch which was
merged on trunk (in SVN), and so does not appear in the svn
log output for the trunk (only the merge message does).
All commits to the SVN trunk since the merge (r9984, r9985,
r10006) are missing from the git clone.
Note that after I merged the branch in
SVN, I deleted it. This was r10294, i.e. at some point after
the missing commits.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-svn depends on:
ii git-core 1:1.6.3.3-2 fast, scalable, distributed revisi
ii libsvn-perl [libsvn-core-per 1.6.5dfsg-1 Perl bindings for Subversion
ii libterm-readkey-perl 2.30-4 A perl module for simple terminal
ii libwww-perl 5.831-1 WWW client/server library for Perl
git-svn recommends no packages.
Versions of packages git-svn suggests:
pn git-doc <none> (no description available)
ii subversion 1.6.5dfsg-1 Advanced version control system
-- no debconf information
--
Jon Dowland
signature.asc
Description: Digital signature
