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

Possible incorrect merge status on update.

From: Alexander Kitaev <alex_at_tmate.org>
Date: 2005-11-08 19:18:44 CET

Hello All,

During update, in case file is locally modified, remote changes are merged
with the local ones.

Remote modifications may include not only text modifications, but also
properties modifications, including svn:eol-style and svn:keywords.

If I understood everething correctly, first, file is "dry-run" merged and
local version of the file is detransalted using existing properties values.
Then, after update is completed, file is merged again, but at this time
'incoming' property values are used. It may happen that "dry-run" merge
input differs from the "real" merge input and "real" merge outcome may
differ from the "dry-run" one, for instance 'G' status may be displayed in
console, but file will be in conflict after update.

My question is whether my understanding is correct or I miss something and
"dry-run" merge during update also uses 'incoming' property values to
detranslate local version of the file?

Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 8 19:19:31 2005

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