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

Diffing/merging properties

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-05-03 21:17:13 CEST

Hello,

I'm fairly certain that diffing properties once worked (via
two instances of TMerge - one for the changes in versioned
files, one for the properties).

I didn't report that this feature seemed to got lost, because
issue #133 refers to issue #244 which was still open
until three weeks ago.

With build 6481 property diffing still doesn't seem to
work. Am I missing something?

BTW: When merging changes into a WC that contain
property changes (e.g. svn:needs-lock set on a binary
file that wasn't changed itself) I receive a conflict. Is
this intended svn behaviour or should I report in on
the subversion list?

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed May 3 21:17:34 2006

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