Re: Diffing/merging properties

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 :)

Stefan

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