Quoting Glen Barber:
> Quoting Mark Reibert:
> > On Thu, 2007-08-30 at 00:25 -0400, Glen Barber wrote:
> > > When I edit a .doc file using MS Word 2003, on occasion I get the error
> > > stating my "working copy may be out-of-date." This message repeats even
> > > after I 'svn up' and try to re-commit. The only 2 solutions I have
> > > found are:
> >
> > If you have edited the (non-text-mergeable, aka binary) file then 'svn
> > up' will simply leave you with a merge conflict that must be manually
> > resolved. After doing so you should be able to commit. See:
> >
> > http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac.merge
> >
> > Note this has nothing to do with a .doc file, per se, but rather it is a
> > situation that will result from simultaneous edits on a file that cannot
> > be textually merged. Your best bet is to avoid this situation via locks
> > and the svn:needs-lock property. See:
> >
> > http://svnbook.red-bean.com/en/1.4/svn.advanced.locking.html#svn.advanced.locking.lock-communication
> >
> I (sort of) see what you're saying. I'll take a look at both docs, and
> appreciate your quick response.
>
Actually -- neither of those docs helped... I created locks for the
files, not realizing at first what I was doing (it's late, and i'm tired
:P ). I am the only editor of those files... I edit from 1 of 2
operating systems, Linux (Ubuntu Feisty, specifically, and Windows XP
Home). Creating locks created more problems (that I can tell).
Any other ideas?
--
Glen Barber
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 29 10:16:04 2007