RE: Merge of Word docs?

You know, I would imagine that there is an ASP .Net
interface to merging
MSOffice docs.
Just a thought. Anyone have any ideas?

 
Regards,
 
Bryan Simmons

-----Original Message-----
From: Luis Malheiro
[mailto:luis.malheiro@rerum.com.br]
Sent: Friday, January 30, 2004 1:39 PM
To: users@subversion.tigris.org
Subject: Re: Merge of Word docs?

Brian Mathis wrote:

> Luis Malheiro wrote:

>

>> Simmons, Bryan wrote:

>>

>>> Ok, so one of the basic characteristics of
subversion is that when a

>>> collision occurs with respect to two people
checking in another

>>> revision

>>> at the same time the last person to check in has
to manually merge
>>> two

>>> revs.

>>> How is this handled with Word files or graphics or
some other
>>> non-ASCII

>>> file?

>>>

>> AFAIK, you would need a tool to make the merge.
ClearCase has one for

>> MSWord. Maybe you could build one using MSWord
macros.

>> The issue doesn't apply only to non-ASCII files,
Rational Rose files

>> are ASCII encoded, but can't be easily merged
without a tool called

>> Model Integrator provided by Rational itself.

>>

>> Luis

>

>

>

> Word actually has this built-in. In Word XP, look
under

> "Tools/Compare and Merge Documents". But as far as
svn integration,

> you're out of luck for now.

>

Does anyone know if it is easier to merge Open Office
documents or even

RTF files?

Luis

---------------------------------------------------------------------

To unsubscribe, e-mail:
users-unsubscribe@subversion.tigris.org

For additional commands, e-mail:
users-help@subversion.tigris.org

__________________________________
Do you Yahoo!?
Yahoo! SiteBuilder - Free web site building tool. Try it!
http://webhosting.yahoo.com/ps/sb/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 30 19:48:25 2004