> From: svante.schub...@gmail.com
> Date: Wed, 29 Apr 2015 20:52:00 +0200
> To: dev@corinthia.incubator.apache.org
> Subject: Re: ODF mapping (was RE: Git revert difficulty)
>
> Am 29.04.2015 um 18:53 schrieb Dennis E. Hamilton:
>>
Am 29.04.2015 um 18:53 schrieb Dennis E. Hamilton:
-- commenting inline to --
From: Peter Kelly [mailto:pmke...@apache.org]
Sent: Sunday, April 26, 2015 21:56
To: dev@corinthia.incubator.apache.org
Subject: Re: Git revert difficulty
On 27 Apr 2015, at 11:27 am, Franz de Copenhague wrote:
I
-- commenting inline to --
From: Peter Kelly [mailto:pmke...@apache.org]
Sent: Sunday, April 26, 2015 21:56
To: dev@corinthia.incubator.apache.org
Subject: Re: Git revert difficulty
> On 27 Apr 2015, at 11:27 am, Franz de Copenhague wrote:
>
> I have a question regardi
> From: pmke...@apache.org
> Subject: Re: Git revert difficulty
> Date: Mon, 27 Apr 2015 11:55:46 +0700
> To: dev@corinthia.incubator.apache.org
>
> > On 27 Apr 2015, at 11:27 am, Franz de Copenhague wrote:
> >
> > I have a question regarding to the ODFTe
> On 27 Apr 2015, at 11:27 am, Franz de Copenhague wrote:
>
> I have a question regarding to the ODFTextConverter to HTML. ODF only use
> span tags and style names to define text content and formats like bold,
> italic, strike, etc as opposite to OOXML that uses run texts tags with
> separate
> From: gabriela.gib...@gmail.com
> Date: Sun, 26 Apr 2015 16:28:32 +0100
> Subject: Re: Git revert difficulty
> To: dev@corinthia.incubator.apache.org
> CC: dennis.hamil...@acm.org
>
> Hi Jan,
>
> I agree, this should really be a branch.
>
> I see if I can wo
Hi Jan,
I agree, this should really be a branch.
I see if I can work out how to move it to a branch, but I'll leave Peter's
excellent stub in place.
However, about trees shooting, well, it's spring. So yeah, they would
shoot ;-D
G
On Sun, Apr 26, 2015 at 3:16 PM, jan i wrote:
> On 26 April
On 26 April 2015 at 15:58, Gabriela Gibson
wrote:
> Hi Peter,
>
> thank you very much for this, it's a great structure to start on :)
>
Please feel tree to shoot me if I am wrong.
I think a feature like ODF should not be developed in "master" but in a
public branch, that way this revert could h
Hi Peter,
thank you very much for this, it's a great structure to start on :)
---
On 26 Apr 2015 02:30, "Dennis E. Hamilton" wrote:
>
> If you look at the file(s) that is(are) being complained about, you might
see that there is a DIFF there instead of the file. Do the process to
reconcile
If you look at the file(s) that is(are) being complained about, you might see
that there is a DIFF there instead of the file. Do the process to reconcile to
what you want to end up with and commit that. Then see if Sync works.
(A little GIT magic joojoo.)
- Dennis
-Original Message-
Hi Gabriela,
I’ve just added a new version of ODFConverter, which is actually called
ODFTextConverter and is located in DocFormats/filters/odf/src/text/. The reason
I’ve used the latter name is to distinguish it from classes like
ODFPresentationConverter and ODFSheetConverter which we may have
Thank you very much :)
G
On Sat, Apr 25, 2015 at 4:12 PM, Peter Kelly wrote:
> The revert failed because it conflicted with some fixes I made to
> OOXMLTypedefs.h, to remove compiler warnings about duplicate typedefs.
>
> ‘git revert’ essentially takes a diff between the files before and after
The revert failed because it conflicted with some fixes I made to
OOXMLTypedefs.h, to remove compiler warnings about duplicate typedefs.
‘git revert’ essentially takes a diff between the files before and after a
given commit, and then applies that patch in reverse. So if changes have been
made
13 matches
Mail list logo
