Re: Feature request: easier property conflict resolving

On 10/14/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 10/14/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> > Hi,
> >
> > Property conflicts are handled by creating .prej files. That's ok.
> > But unlike resolving text conflicts, a GUI diff tool can't just resolve
> > the conflict and write the correct file to the original file.
>
> Well, actually, with my upcoming change, it can. TSVN will be able to
> interactively resolve property conflicts the same way it interactively
> resolves text-conflicts: the conflict_description_t will provide 3
> files containing the different property values, as well as a 4th file
> containing an "attempted merge". I assume that will solve your
> problem?

It does ... sort of. At some point (certainly after 1.5) we really
need a way to this same sort of thing "after the fact". The
interactive stuff will be great as long as the user does not postpone
action. Once the conflict is created we are stuck with the problems
that Stefan mentions.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org