Re: [Tiki-devel] Is 11 still on auto merge?

[Jonny B. <jo...@ti...>]

Hi Pascal and show guys! :)

Basically, yes, the semi-auto-merge is still working (they go from 11.x to trunk, anything in trunk needed in 11.x needs to be manually back-ported) - doing an update now...

    $ cd trunk
    $ php doc/devtools/svnbranchupdate.php branches/11.x
(check for conflicts)
    $ svn ci -F svn-commit.tmp

There, simples ;)

Probably an sefurl .htaccess missing thing again... trying locally, hmm, seems fine here if feature_sefurl is disabled and there's no .htaccess, in fact even if sefurl is on and there's no .htaccess this bit works ok for me, so must be something else.

Checking in Firefox i do get a couple of errors like:

> XML Parsing Error: XML or text declaration not at start of entity Location: moz-nullprincipal:{7aa1ea23-ef43-1d45-b59c-09db3441a07d} Line Number 1, Column 2:
> 	<?xml version="1.0" encoding="UTF-8"?><adapter command="auto_save"><data><![CDA...
> --------^

Which looks like there are a load of spaces before the xml declaration - so seems like a show.t.o artefact - can you or anyone else recreate elsewhere?

jb

P.S. Small polite request to all jCapture users: Please can you just capture the relevant both of the screen? These huge movies make the wish pages really hard to read ;)



On 14 Aug 2013, at 10:48, Pascal St-Jean <pas...@gm...> wrote:

> https://dev.tiki.org/tiki-view_tracker_item.php?itemId=4635
> 
> Just wondering if 11 is still getting trunk merges?
> 
> Because this bug no longer exists in trunk which means it will be fixed in 11.1 correct?
> 
> ------------------------------------------------------------------------------
> Get 100% visibility into Java/.NET code with AppDynamics Lite!
> It's a free troubleshooting tool designed for production.
> Get down to code-level detail for bottlenecks, with <2% overhead. 
> Download for free and get started troubleshooting in minutes. 
> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk_______________________________________________
> TikiWiki-devel mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel