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

Unresolved conflicts and Update

From: Rob Davies <rob_at_softease.com>
Date: 2004-07-08 17:40:47 CEST

I haven't managed to find anything on this in the list archive,
so either it ain't there or I'm plugging in the wrong keywords. :]

There seems to be a problem with Subversion (1.0.4 r9844)
regarding Updating a file that is currently marked as "Conflicted".

The problem is that it allows the update, but doesn't modify the
<filename>.mine file that is still in existence from the previous
update. As a result, the .mine file shows code prior to any
changes you made since the first update, and can result in code
loss via, e.g., TortoiseMerge if you click "Save" before realising.

Would it be possible to have Subversion refuse the update of an
unresolved file, or update the .mine file to the current state of
the file (potential dangerous, former would likely be a better idea)?

Or, alternatively, if I've missed something, could someone please
advise? :)

Thanks,

Rob.

P.S.: In case it helps, the working copy is running on NTFS on a
WinXP Pro machine (there're no problems with file or security
permissions, though, to prevent an update to the .mine file).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 8 17:39:06 2004

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