[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: copy-modify-merge with office

From: lejeczek <peljasz_at_yahoo.co.uk>
Date: Tue, 12 Aug 2014 18:31:49 +0100

both ms and libre can save in flat xml format as far as I
know, newer ms office versions even in open document format
1.2 v.
but as Simon says it's not subversion but the app itself
that should do the merging

On 12/08/14 15:17, Andy Levy wrote:
> On Tue, Aug 12, 2014 at 9:55 AM, lejeczek <peljasz_at_yahoo.co.uk> wrote:
>> gottcha... that would be amazing it it had it!
>> I wonder if libreOffice handles collaboration better?
>> many thanks
> Last I knew, LibreOffice used a similar zipped XML format.
>
>> On 12/08/14 14:26, Simon Large wrote:
>>> On 12 August 2014 13:05, lejeczek <peljasz_at_yahoo.co.uk> wrote:
>>>> forgive me for I'm a novice and courios
>>>> but compare, this works, sill no elaborate way to merge?
>>>> this zips tortoise can unzip, look into xml files and
>>>> compare, why not merge I wonder?
>>> TortoiseSVN does not unzip and look into XML files. It is Word itself
>>> which is doing that. If you look at TSVN->Settings->Diff
>>> Viewer->Advanced you will see that there is a vbs script set up for
>>> that file extension, and the script calls Word with the appropriate
>>> command line flags. There is no Word command to merge files.
>>>
>>> Simon
>>>
>>>> On 12/08/14 11:54, Simon Large wrote:
>>>>> On 12 August 2014 10:45, lejeczek <peljasz_at_yahoo.co.uk> wrote:
>>>>>> hi all
>>>>>> wanted to ask if copy-modify-merge is valid concept for ms
>>>>>> office under subversion?
>>>>>> I see everybody says request lock for all office docs and I
>>>>>> wonder whether it's all precaution or merge actually cannot
>>>>>> be done on .docx and likes?
>>>>> Subversion can only merge plain (8-bit) text files. All office docs
>>>>> are proprietary binary formats and cannot be merged automatically, so
>>>>> using locks is the only safe way to work with these files.
>>>>>
>>>>> Simon
>>>>>
>>>>> ------------------------------------------------------
>>>>> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086634
>>>>>
>>>>> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>>>>>
>>>> ------------------------------------------------------
>>>> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086636
>>>>
>>>> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>>> ------------------------------------------------------
>>> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086638
>>>
>>> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>>>
>> ------------------------------------------------------
>> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086640
>>
>> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086641
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086646

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-12 19:33:42 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.