On Wed, Feb 11, 2015 at 10:34 AM, Stephan Beal sgb...@googlemail.com
wrote:
The infrastructure is there to support merging wikis content just like
other content, but the logic/code is missing for such handling of wiki
pages and tickets. Your proposal would add a lot of logic for wikis which
On 2/11/15, Ron W ronw.m...@gmail.com wrote:
As I understand it, the only thing missing during the commit of a wiki
page is identification of the parent commit.
The P-card on the Wiki artifact
(https://www.fossil-scm.org/skin2/doc/trunk/www/fileformat.wiki#wikichng)
shows the parent(s) of
On Wed, Feb 11, 2015 at 4:18 PM, David Mason dma...@ryerson.ca wrote:
While we're at it. I would *really* like to have merging of wiki
pages upon sync. Ideal would be for any conflict to produce a warning
at sync time and to add to a table that would be visible in the wiki
tab on the ui,
While we're at it. I would *really* like to have merging of wiki
pages upon sync. Ideal would be for any conflict to produce a warning
at sync time and to add to a table that would be visible in the wiki
tab on the ui, with the page removed from that table upon edit.
../Dave
On 31 January 2015
On Wed, Feb 11, 2015 at 3:33 PM, Andreas Kupries andre...@activestate.com
wrote:
AFAIK wiki pages have no parent.
The various commits to a specific page P are simply _time_ordered_
under the name of the page.
That's my point. The web UI's wiki editor page does not have the ID of the
commit
AFAIK wiki pages have no parent.
The various commits to a specific page P are simply _time_ordered_
under the name of the page.
IOW wiki pages have no full-blown branching system, etc.
Hence also the impossibility of 'merging' changes.
On Wed, Feb 11, 2015 at 12:03 PM, Ron W
On Wed, Feb 11, 2015 at 12:19 PM, Richard Hipp d...@sqlite.org wrote:
The P-card on the Wiki artifact
(https://www.fossil-scm.org/skin2/doc/trunk/www/fileformat.wiki#wikichng)
shows the parent(s) of each Wiki commit. This has always been
recorded.
In Fossil version [3e5ebe2b90], when
7 matches
Mail list logo
