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

Re: Diffing/merging properties

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-05-04 18:59:06 CEST

Sven Brueggemann wrote:

> 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?

I think that would be something for the Subversion list. TSVN doesn't
create conflicts :)


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu May 4 18:59:18 2006

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

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