diff options
| author | Joey Hess <joey@kitenet.net> | 2011-10-12 19:05:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-12 19:07:38 -0400 |
| commit | 496874ab270390c8105911994f874e39abf560a8 (patch) | |
| tree | 5ea34f6b6f9b74a1d4df0fdbed182703e5485d31 /debian | |
| parent | d94419e42c1fe589bb95403f62fa7a77019bf273 (diff) | |
| download | ikiwiki-496874ab270390c8105911994f874e39abf560a8.tar ikiwiki-496874ab270390c8105911994f874e39abf560a8.tar.gz | |
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d852c6b61..35de8de8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low * searchquery.tmpl: Track escaping change in upstream template. Thanks Olly Betts for review. + * svn: Support subversion 1.7, which does not have .svn in each + subdirectory. -- Joey Hess <joeyh@debian.org> Tue, 27 Sep 2011 10:47:13 -0400 |