Re: [PATCH] git svn: make empty directory creation gc-aware
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:55
Eric Wong [off-list ref] writes:
The "git svn gc" command creates and appends to unhandled.log.gz files which should be parsed before the uncompressed unhandled.log files. Reported-by: Robert Zeh Signed-off-by: Eric Wong <redacted> --- Eric Wong [off-list ref] wrote: > Robert Zeh [off-list ref] wrote: > > It looks like there is a conflict between git svn gc and git svn > > mkdirs. The git svn mkdirs command only looks at unhandled.log files. > > Shouldn't it also look at any compressed unhandled.log files too? > > Hi Robert, > > Yes, an oversight. Does this patch work for you? (Highly untested) Test case included and pushed out to git://git.bogomips.org/git-svn More pushes hopefully coming as Sam and Andrew work out the mergeinfo performance problems and I look into crossing svn-remote boundaries for parent lookups.
Thanks.
This particular patch should be in 1.6.6 final, because mkdirs first
appeared in 1.6.6-rc0 at 6111b93 (git svn: attempt to create empty dirs on
clone+rebase, 2009-11-15), and 1.6.5.X series does not have the command,
so this seems like a new feature that never existed in any tagged release,
and if we shipped 1.6.6 without this patch, we will be shipping it with a
know breakage, while if we shipped it with this, even if this patch
somehow had an unintended side effect, at worst we'd be exchanging a bug
with some other bug, so it wouldn't be worse.
Is mkdirs the only "noteworthy" feature that should be mentioned in the
Release Notes in your area? It would be really nice if you can give a
patch to Documentation/RelNotes-1.6.6.txt in a few days to turn a single
liner I have there to something more helpful. The current shortlog since
1.6.5 indicates there weren't that much activity during this release.
Alex Vandiver (3):
git-svn: sort svk merge tickets to account for minimal parents
git-svn: Set svn.authorsfile to an absolute path when cloning
git-svn: set svn.authorsfile earlier when cloning
Eric Wong (7):
git svn: fix fetch where glob is on the top-level URL
git svn: read global+system config for clone+init
git svn: attempt to create empty dirs on clone+rebase
git svn: always reuse existing remotes on fetch
git svn: strip leading path when making empty dirs
git svn: log removals of empty directories
git svn: make empty directory creation gc-aware
Greg Price (1):
git svn: Don't create empty directories whose parents were deleted
Jonathan Nieder (2):
add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
am -i, git-svn: use "git var GIT_PAGER"
Sam Vilain (2):
git-svn: convert SVK merge tickets to extra parents
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
Thomas Rast (1):
Document git-svn's first-parent rule
Toby Allsopp (1):
git svn: handle SVN merges from revisions past the tip of the branch