Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Merge reports conflict on extern properties

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Merge reports conflict on extern properties

Author fsaphir
Full name Felix Saphir
Date 2011-02-04 02:02:37 PST
Message Am 04.02.2011 10:26, schrieb David Kitchen:
> I have a directory referencing about 100 versioned externs. If two
> developers change separate entries in the externs property, an attempt
> to merge is always marked as a conflict (presumable because the property
> is viewed as a single 'text line'.) However, the TortoiseSVN conflict
> resolution tool (usually) reports the changes correctly (as mergable).
> So, should svn take a more intelligent roll in merging know property
> formats, or can TortoiseSVN apply some hints, or does anyone have better
> ideas on branch-trunk merges of externs: property?

I think that conflict handling is done in the svn library, so there's
nothing TortoiseSVN can do.

Felix

« Previous message in topic | 2 of 2 | Next message in topic »

Messages

Show all messages in topic

Merge reports conflict on extern properties David Kitchen <dave dot kitchen at insync dot tv> David Kitchen <dave dot kitchen at insync dot tv> 2011-02-04 01:26:06 PST
     Re: Merge reports conflict on extern properties fsaphir Felix Saphir 2011-02-04 02:02:37 PST
Messages per page: