diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-29 03:25:09 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-29 03:25:09 +0000 |
| commit | 5c36a5cfc675ca4282c0a03ee444c43dea537fa9 (patch) | |
| tree | faeb6824939206186f1986caea67cd15b12a2f08 | |
| parent | a1d9abab8c1542d546c34fa03447d1f6456ba813 (diff) | |
| download | ikiwiki-5c36a5cfc675ca4282c0a03ee444c43dea537fa9.tar ikiwiki-5c36a5cfc675ca4282c0a03ee444c43dea537fa9.tar.gz | |
* Apply patch from hb that uses the full path to a file when adding a file
using the mercurial backend. Not 100% sure why it failed w/o the full
path, but this still passes the test suite, and indeed, is how the test
suite calls hg add.
| -rw-r--r-- | IkiWiki/Rcs/mercurial.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/mercurial_fail_to_add.mdwn (renamed from doc/patchqueue/mercurial_fail_to_add.mdwn) | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm index 2e15085ec..3a75b40c5 100644 --- a/IkiWiki/Rcs/mercurial.pm +++ b/IkiWiki/Rcs/mercurial.pm @@ -95,7 +95,7 @@ sub rcs_commit ($$$;$$) { #{{{ sub rcs_add ($) { # {{{ my ($file) = @_; - my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$file"); + my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file"); if (system(@cmdline) != 0) { warn "'@cmdline' failed: $!"; } diff --git a/debian/changelog b/debian/changelog index 22de08854..1a14021c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,8 +44,12 @@ ikiwiki (1.51) UNRELEASED; urgency=low * Updated Polish translation from Pawel Tecza. * Updated Czech translation from Miroslav Kure. * Updated Spanish translation from Victor Moral. + * Apply patch from hb that uses the full path to a file when adding a file + using the mercurial backend. Not 100% sure why it failed w/o the full + path, but this still passes the test suite, and indeed, is how the test + suite calls hg add. - -- Joey Hess <joeyh@debian.org> Sat, 28 Apr 2007 22:47:38 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 28 Apr 2007 23:51:35 -0400 ikiwiki (1.50) unstable; urgency=low diff --git a/doc/patchqueue/mercurial_fail_to_add.mdwn b/doc/bugs/mercurial_fail_to_add.mdwn index 86ee6ab15..d47960e9b 100644 --- a/doc/patchqueue/mercurial_fail_to_add.mdwn +++ b/doc/bugs/mercurial_fail_to_add.mdwn @@ -16,3 +16,11 @@ Here is a patch that's seems to work, although I'm not quite sure what's wrong w } My srcdir path has some symbolics links and hidden directorys... maybe that's it ? + +> Interesting, the mercurial test suite shows the add without the path +> working ok. OTOH, it also continues to work if I apply your patch, so I +> guess it's safe enough. It would be good to know why it's failing w/o the +> path in your case. --[[Joey]] + +> As I applied the patch, I'm moving this out of the patchqueue to bugs and +> marking it [[done]]. --[[Joey]] |