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

RE: Simple questions updating binary files

From: Wadsworth, Eric (Contractor) <wadswore_at_fhu.disa.mil>
Date: 2004-01-10 02:29:01 CET

The other day I did something with a word document (I don't recall what, but
I thought it was copying a newer version of the file over the older one),
and Word popped up and asked if I wanted to merge the changes into this
document instead of replacing it. I was kinda shocked. I just looked in the
help, and found that Word can changes in documents. Look up "Collaborate on

> Concerning Simple questions updating binary fi
> Adam Lofstedt wrote on 8 Jan 2004, 11:06, at least in part:
> > Can you actually view the diffs in a binary file like a MS
> Word .doc, see
> > the changed lines, and then merge those changes? When I
> try to do that with
> > TortoiseSVN, I get jibberish when viewing the diffs and
> merges. I don't
> > think so, but maybe I'm wrong?
> I have read that both P4Diff a/o P4Merge (Perforce) and CS-Diff
> (Component Software) can utilize Word for this sort of diffs/merges,
> but I have not tried myself so far.
> Jan hendrik

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 10 02:30:00 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.