Restore 'has edit conflicts - skipped' - how to avoid

Hi there.

Here's a simple, but very very annoying new experience I'm having - I 
hope someone can give me the key.

I'm splitting one of our sites, and after clicking 'upload' to 
restore the new phpwiki with the prior .zipdump (not a snapshot, 
because I want to retain the edit history as much as possible), I get 
the following error in PhpWikiAdministration for every revision of 
every page after the first:

"PageName
from MIME file [name] has edit conflicts - skipped "

and for each, I have the option to 'Merge Edit' or 'Restore Anyway'

I know I want to 'Restore Anyway', but we have hundreds of pages 
here, many with up to ten revisions.

How can I return the behavior to the desired pattern, where all the 
revisions are loaded in automatically, and I can avoid the hundreds 
of mouseclicks?

Thanks amazingly much,
Micki

At 8:04 PM -0800 12/5/03, phpwiki-talk-request@xxxxxxxxxxxxxxxxxxxxx wrote:
> Send Phpwiki-talk mailing list submissions to
>         phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
>
> To subscribe or unsubscribe via the World Wide Web, visit
>         https://lists.sourceforge.net/lists/listinfo/phpwiki-talk
> or, via email, send a message with subject or body 'help' to
>         phpwiki-talk-request@xxxxxxxxxxxxxxxxxxxxx
>
> You can reach the person managing the list at
>         phpwiki-talk-admin@xxxxxxxxxxxxxxxxxxxxx
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of Phpwiki-talk digest..."
>
>
> Today's Topics:
>
>    1. Re: Adding '<caption>' tags to tables from wiki (Reini Urban) 
> (Micki Kaufman)
>    2. phpwiki loads but page content is 'garbage' (Dan Sawyer)
>    3. how to upload phpwiki to a server?? (Dan Sawyer)
>    4. Re: Adding '<caption>' tags to tables from wiki (Reini Urban) 
> (Micki Kaufman)
>    5. Re: Adding '<caption>' tags to tables from wiki (Reini Urban) 
> (Micki Kaufman)
>    6. Re: Adding '<caption>' tags to tables from wiki (Carsten Klapp)
>    7. Re: Re: Adding '<caption>' tags to tables from wiki
>        (Reini Urban) (Reini Urban)
>    8. Re: Re: Adding '<caption>' tags to tables from wiki
>        (Reini Urban) (Reini Urban)
>    9. Re: Re: Adding '<caption>' tags to tables from wiki (Reini 
> Urban) (Carsten Klapp)
>   10. Re: 1.4 before Christmas (Joby Walker)
>
> --__--__--
>
> Message: 1
> Date: Fri, 5 Dec 2003 10:16:06 -0500
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> From: Micki Kaufman <micki001@xxxxxxxxxxxxxx>
> Subject: [Phpwiki-talk] Re: Adding '<caption>' tags to tables from 
> wiki (Reini Urban)
>
> Reini and Carsten:
>
> Thanks for your great, quick work on this mini-feature. Our disabled
> and DocBook users alike will be very well served. This weekend I'll
> be upgrading the wikis, and can provide my and the users' feedback.
>
> Stylesheet tweak needed?
>
> On our 1.3.4 wiki, the <caption> contents are rendered as 'yellow
> text' by the default stylesheet. We may wanna make a quick mod to the
> stylesheet so that the captions are in black. The font (medium size,
> non-bold) seems fine as is.
>
> Anyway, rocking work, and many many thanks,
> Micki
>
> > Message: 4
> > Date: Thu, 04 Dec 2003 15:25:20 +0100
> > From: Reini Urban <rurban@xxxxxxxx>
> > To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> > Subject: Re: [Phpwiki-talk] Adding '<caption>' tags to tables from wiki
> > The attached diff is better.
> > It supports summary also, has no linebreaks and
> > it also includes the new pgsrc of the description page.
>
>
> --
>
> Micki
> mailto:micki001@xxxxxxxxxxxxxx
>
>
> --__--__--
>
> Message: 2
> Date: Fri, 05 Dec 2003 08:05:50 -0800
> From: Dan Sawyer <dansawyer@xxxxxxxxxxxxx>
> To:  phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> Subject: [Phpwiki-talk] phpwiki loads but page content is 'garbage'
>
> All,
>
> phpwiki 1.3.6 installs and initializes. The pages appear to be being
> built in the 'virgin wiki' page. However all attempts to access those
> pages result in 'gargage' pages. If the initial page is reloaded with
> the back page then the readable content is loaded. If that page is
> reloaded then garbage appears.
>
> The system is Fedora Core 1, the browser is Mozilla 1.4.1. This is
> almost like a 'decode key' issue??
>
> Below is a sample of the page output:
>
> -
>
>
>
> --__--__--
>
> Message: 3
> Date: Fri, 05 Dec 2003 09:18:23 -0800
> From: Dan Sawyer <dansawyer@xxxxxxxxxxxxx>
> To:  phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> Subject: [Phpwiki-talk] how to upload phpwiki to a server??
>
> All,
>
> I have phpwiki working within the local network. I would like to upload
> that instance to a server. What is the file list and dir list from the
> php dir that needs to be uploaded? (I will edit index.php to create a
> flat file new wiki on that site.)
>
> Dan
>
>
>
>
>
> --__--__--
>
> Message: 4
> Date: Fri, 5 Dec 2003 15:07:43 -0500
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> From: Micki Kaufman <micki001@xxxxxxxxxxxxxx>
> Subject: [Phpwiki-talk] Re: Adding '<caption>' tags to tables from 
> wiki (Reini Urban)
>
> Hi Reini:
>
> I noticed the resulting table has the attribute 'caption', like this:
>
> <table caption="This is a caption" cellpadding="1" cellspacing="1" border="1">
>
> but it really should be a separate open and close tag, before the
> first 'tr' tag, like:
>
> <table cellpadding="1" cellspacing="1" border="1">
> <caption>This is a caption</caption>
> <tr>
>
> John: do you agree?
>
> Reini - an we get a tweak to achieve this? Thanks!
> Micki
>
> > Message: 4
> > Date: Thu, 04 Dec 2003 15:25:20 +0100
> > From: Reini Urban <rurban@xxxxxxxx>
> > To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> > Subject: Re: [Phpwiki-talk] Adding '<caption>' tags to tables from wiki
> > The attached diff is better.
> > It supports summary also, has no linebreaks and
> > it also includes the new pgsrc of the description page.
>
>
> --
>
> Micki
> mailto:micki001@xxxxxxxxxxxxxx
>
>
> --__--__--
>
> Message: 5
> Date: Fri, 5 Dec 2003 15:12:41 -0500
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> From: Micki Kaufman <micki001@xxxxxxxxxxxxxx>
> Subject: [Phpwiki-talk] Re: Adding '<caption>' tags to tables from 
> wiki (Reini Urban)
>
> I forgot to mention - the ability to set border, cellpadding and
> cellspacing is a great mod - many thanks independently for this!
>
> Thanks,
> Micki
>
> > Hi Reini:
> >
> > I noticed the resulting table has the attribute 'caption', like this:
> >
> > <table caption="This is a caption" cellpadding="1" cellspacing="1" 
> > border="1">
> >
> > but it really should be a separate open and close tag, before the
> > first 'tr' tag, like:
> >
> > <table cellpadding="1" cellspacing="1" border="1">
> > <caption>This is a caption</caption>
> > <tr>
> >
> > John: do you agree?
> >
> > Reini - an we get a tweak to achieve this? Thanks!
> > Micki
> >
> > > Message: 4
> > > Date: Thu, 04 Dec 2003 15:25:20 +0100
> > > From: Reini Urban <rurban@xxxxxxxx>
> > > To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> > > Subject: Re: [Phpwiki-talk] Adding '<caption>' tags to tables from wiki
> > > The attached diff is better.
> > > It supports summary also, has no linebreaks and
> > > it also includes the new pgsrc of the description page.
>
> --
>
> Micki
> mailto:micki001@xxxxxxxxxxxxxx
>
>
> --__--__--
>
> Message: 6
> Date: Fri, 5 Dec 2003 15:41:35 -0500
> Subject: Re: [Phpwiki-talk] Adding '<caption>' tags to tables from wiki
> From: Carsten Klapp <carstenklapp@xxxxxxxxxxxxxxxxxxxxx>
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
>
>
> On Thursday, December 4, 2003, at 09:25  am, Reini Urban wrote:
>
> >  The attached diff is better.
> >  It supports summary also, has no linebreaks and
> >  it also includes the new pgsrc of the description page.
>
> Hi,
>
> Thanks you two, for working on this!
>
> I applied the second patch to
> htdocs/phpwiki2/lib/plugin/OldStyleTable.php for testing. Only one
> problem, the caption does not show. :/
>
>
> http://phpwiki.sourceforge.net/phpwiki/OldStyleTablePlugin
>
>
> I found the bug: caption is not an attribute of <table>, rather it must
> be the first sub-element (if present). So it should be like this:
>
> <table summary="summary">
> <caption>Table caption</caption>
> <tr><td>first row</td></tr>
>
> http://www.w3.org/TR/1999/REC-html401-19991224/struct/tables.html
>
> Cheers,
> Carsten
>
>
> Here's the updated patch: (some of it is text reformatting)
>
> Index: OldStyleTable.php
> ===================================================================
> RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/OldStyleTable.php,v
> retrieving revision 1.7
> diff -U2 -r1.7 OldStyleTable.php
> --- OldStyleTable.php   21 Feb 2003 23:00:35 -0000      1.7
> +++ OldStyleTable.php   5 Dec 2003 20:37:28 -0000
> @@ -1,4 +1,5 @@
>   <?php // -*-php-*-
>   rcs_id('$Id: OldStyleTable.php,v 1.7 2003/02/21 23:00:35 dairiki Exp
> $');
> +
>   /**
>    Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
> @@ -26,5 +27,5 @@
>    * Usage:
>    * <pre>
> - *  <?plugin OldStyleTable
> + *  <?plugin OldStyleTable border||=0 summary=""
>    *  ||  __Name__               |v __Cost__   |v __Notes__
>    *  | __First__   | __Last__
> @@ -51,5 +52,5 @@
>
>       function getDescription() {
> -      return _("Layout tables using the old markup style.");
> +        return _("Layout tables using the old markup style.");
>       }
>
> @@ -60,5 +61,15 @@
>
>       function getDefaultArguments() {
> -        return array();
> +        return array(
> +                     'caption'     => '',
> +                     'cellpadding' => '1',
> +                     'cellspacing' => '1',
> +                     'border'      => '1',
> +                     'summary'     => '',
> +                     );
> +    }
> +
> +    function handle_plugin_args_cruft($argstr, $args) {
> +        return;
>       }
>
> @@ -67,12 +78,33 @@
>           include_once('lib/InlineParser.php');
>
> +        $args = $this->getArgs($argstr, $request);
> +        $default = $this->getDefaultArguments();
> +        foreach (array('cellpadding', 'cellspacing', 'border') as
> $arg) {
> +            if (!is_numeric($args[$arg])) {
> +                $args[$arg] = $default[$arg];
> +            }
> +        }
>           $lines = preg_split('/\s*?\n\s*/', $argstr);
> -        $table = HTML::table(array('cellpadding' => 1,
> -                                   'cellspacing' => 1,
> -                                   'border' => 1));
> +        $table_args = array();
> +        $default_args = array_keys($default);
> +        foreach ($default_args as $arg) {
> +            if ($args[$arg] == '' and $default[$arg] == '')
> +                continue;                      // ignore '' arguments
> +            $table_args[$arg] = $args[$arg];
> +        }
> +        unset($table_args['caption']);
> +        $table = HTML::table($table_args);
> +        if ($caption = $args['caption']) {
> +            $table->pushContent(HTML::caption(array('align'=>'top'),
> $caption));
> +        }
>
>           foreach ($lines as $line) {
>               if (!$line)
>                   continue;
> +            if (strstr($line, "=")) {
> +               $tmp = explode("=", $line);
> +               if (in_array(trim($tmp[0]), $default_args))
> +                    continue;
> +            }
>               if ($line[0] != '|')
>                   return $this->error(fmt("Line does not begin with a
> '|'."));
> @@ -85,6 +117,5 @@
>       function _parse_row ($line, $basepage) {
>           $brkt_link = "\\[ .*? [^]\s] .*? \\]";
> -        $cell_content  = "(?: [^[] | ".ESCAPE_CHAR."\\[ | $brkt_link
> )*?";
> -
> +        $cell_content  = "(?: [^[] | " . ESCAPE_CHAR . "\\[ |
> $brkt_link )*?";
>           preg_match_all("/(\\|+) (v*) ([<>^]?) \s* ($cell_content) \s*
> (?=\\||\$)/x",
>                          $line, $matches, PREG_SET_ORDER);
> @@ -116,4 +147,8 @@
>       }
>   };
> +
> +// Caption & summary patch from [phpwiki-talk] by MickiKaufman and
> +// ReiniUrban 2003-12-04. Not yet checked into CVS.
> +
>
>   // $Log: OldStyleTable.php,v $
>
>
>
> --__--__--
>
> Message: 7
> Date: Fri, 05 Dec 2003 22:14:31 +0100
> From: Reini Urban <rurban@xxxxxxxx>
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> Subject: Re: [Phpwiki-talk] Re: Adding '<caption>' tags to tables from wiki
>  (Reini Urban)
>
> Micki Kaufman schrieb:
> >  I noticed the resulting table has the attribute 'caption', like this:
> >
> >  <table caption="This is a caption" cellpadding="1" cellspacing="1"
> >  border="1">
> >
> >  but it really should be a separate open and close tag, before the first
> >  'tr' tag, like:
> >
> >  <table cellpadding="1" cellspacing="1" border="1">
> >  <caption>This is a caption</caption>
> >  <tr>
>
> oops!
> sorry, i didn't have a look into the specs. i'll do the change asap.
> it's very easy.
> --
> Reini Urban
> http://xarch.tu-graz.ac.at/home/rurban/
>
>
>
> --__--__--
>
> Message: 8
> Date: Fri, 05 Dec 2003 22:16:15 +0100
> From: Reini Urban <rurban@xxxxxxxx>
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> Subject: Re: [Phpwiki-talk] Re: Adding '<caption>' tags to tables from wiki
>  (Reini Urban)
>
> oops again, carsten already did it. thanks.
>
> Reini Urban schrieb:
>  > oops!
>  > sorry, i didn't have a look into the specs. i'll do the change asap.
>  > it's very easy.
>
> >  Micki Kaufman schrieb:
> > >  I noticed the resulting table has the attribute 'caption', like this:
> > >
> > >  <table caption="This is a caption" cellpadding="1" cellspacing="1"
> > >  border="1">
> > >
> > >  but it really should be a separate open and close tag, before the
> > >  first 'tr' tag, like:
> > >
> > >  <table cellpadding="1" cellspacing="1" border="1">
> > >  <caption>This is a caption</caption>
> > >  <tr>
> --
> Reini Urban
> http://xarch.tu-graz.ac.at/home/rurban/
>
>
>
> --__--__--
>
> Message: 9
> Date: Fri, 5 Dec 2003 17:12:51 -0500
> Subject: Re: [Phpwiki-talk] Re: Adding '<caption>' tags to tables 
> from wiki (Reini Urban)
> Cc: Micki Kaufman <micki001@xxxxxxxxxxxxxx>
> To: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> From: Carsten Klapp <carstenklapp@xxxxxxxxxxxxxxxxxxxxx>
>
>
> On Friday, December 5, 2003, at 03:48  pm, Micki Kaufman wrote:
>
> >  Hi Carsten!
> >
> >  Looks great! Rocking rocking rocking!!!
> >
> >  Hey - if centeredness is a little tweaky, can we set the caption to be
> >  left-flush (align=left), or remove the align tag? I assume that's NOT
> >  in the stylesheet cause it's an attribute of the caption element.
> >
> >  What do you think?
> >
> >  Thanks,
> >  Micki
>
> Hi Micki,
>
> I understand the need for align=top for the older browsers, but I'm a
> little reluctant to do (subjectively-) TOO much with depreciated HTML4
> attributes in the release code of PhpWiki.
>
> Of course you're absolutely welcome to modify your own wikis according
> to your situation and needs. :)
>
> It should be pretty easy to tweak, just change this line:
>
>              $table->pushContent(HTML::caption(array('align'=>'top'),
> $caption));
>
> As far as I understand, align=left would insert the caption in
> front(left) of the WHOLE table, probably not what you want. Also, the
> alignment of caption text WITHIN the cell is not clearly defined by the
> HTML standard, and really is up to the individual browser how it is
> displayed. You can try something like this:
>
>              $table->pushContent(HTML::caption(array('align' => 'top',
>                                                      'style' =>
> 'text-align:left;'),
>                                                $caption));
>
> Or, add this to the CSS stylesheet: (but it will affect ALL tables in
> PhpWiki, even page lists returned from searches, etc.)
>
> table caption { text-align: left; }
>
> Carsten
>
>
>
> --__--__--
>
> Message: 10
> Date: Fri, 05 Dec 2003 15:58:19 -0800
> From: Joby Walker <joby@xxxxxxxxxxxxxxxx>
> To: Joby Walker <joby@xxxxxxxxxxxxxxxx>
> CC: phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> Subject: Re: [Phpwiki-talk] 1.4 before Christmas
>
> I'll see what I can do this weekend, but I've been swamped by worms 
> and jury duty...
>
> jbw
>
> Joby Walker wrote:
>
> >  Reini Urban wrote:
> >
> > >  aphid schrieb:
> > >
> > > >  On Nov 9, 2003, at 11:53 AM, Steve Wainstead wrote:
> > > >
> > > > >  I'd like to work on documentation and get the current code base
> > > > >  released as 1.4 before Christmas.
> > > >
> > > >
> > > >
> > > >
> > > >  Hm, any chance at external db user auth making it into 1.4?  That
> > > >  would like Christmas in December.. err.. you know what I mean.
> > >
> > >
> > >
> > >  Yes, the chance is good, since I quit my dayjob which really exhausted
> > >  me, and I have much more time now.
> > >
> > >  I just need some weeks to setup my infrastructure to continue where I
> > >  left.
> >
> >
> >  I should be able to get the group checking working too.
> >
> >  jbw
> >
> >
> >
> >  -------------------------------------------------------
> >  This SF.Net email sponsored by: ApacheCon 2003,
> >  16-19 November in Las Vegas. Learn firsthand the latest
> >  developments in Apache, PHP, Perl, XML, Java, MySQL,
> >  WebDAV, and more! http://www.apachecon.com/
> >  _______________________________________________
> >  Phpwiki-talk mailing list
> >  Phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> >  https://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>
>
>
>
> --__--__--
>
> _______________________________________________
> Phpwiki-talk mailing list
> Phpwiki-talk@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/phpwiki-talk
>
>
> End of Phpwiki-talk Digest


--

Micki
mailto:micki001@xxxxxxxxxxxxxx


-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/