Package: ikiwiki
Severity: normal
Tags: upstream
as i am editing a site over which i do not have direct sysadmin control
(cannot re-generate the wiki by hand nor correct errors in its operation)
this emphasises a need for ikiwiki to be always 100% functional or
recoverable.
the problem is that it is not recoverable: going in as an administrator
for the wiki and regenerating the HTML does *not* fix the problem,
merely repeats the same error which came from the initial merge
conflict.
to reproduce:
* create some files and subdirectories (any method is ok)
* using direct git access (bypassing ikiwiki) perform
a "git mv" operation
* perform a direct "git push" operation.
at this point the error below is reported at the console (git post-commit
hook). follow-up attempts to go in via the ikiwiki preferences, and
to hit "save setup" result in exactly the same error.
the only method of recovery is to have sysadmin rights *on the target
system* (which is not available in this specific instance) and to
perform a manual recovery.
ideally such a manual override / recovery should be available as
an option on the preferences/admin page.
generating wrappers..
refreshing wiki..
error: Your local changes to the following files would be overwritten by merge:
community_ideas/laptop_13in.mdwn
Please, commit your changes or stash them before you can merge.
Aborting
'git pull --prune origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm
line 218.
done
-- System Information:
Debian Release: 7.4
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
