Your message dated Mon, 18 Jan 2016 16:40:47 +0000
with message-id <[email protected]>
and subject line Re: Bug#775310: ikiwiki: git mv on directories results in git
merge/overwrite errors
has caused the Debian Bug report #775310,
regarding ikiwiki: git mv on directories results in git merge/overwrite errors
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
775310: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775310
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
On 18/01/16 13:39, Luke Kenneth Casson Leighton wrote:
> my friend running the
> server discovered, after around 18 months of puzzled investigation,
> that he had (or perhaps had not) added a certain critical
> system-required file to .gitignore as part of the upgrade to
> gitolite3.
OK, closing this as "not our bug" then. Thanks!
> although it
> would only be a kludge, the "manual recovery" i propose(d) would be an
> "rm -fr * and a git clone", or a "git reset --hard".
Sorry, I don't think destroying changes/history is something we should
do as an automated recovery path. If that means ikiwiki isn't suitable
for environments where you don't have shell access, then that might be
the price we have to pay for not losing data.
S
--- End Message ---
