You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Küng <to...@gmail.com> on 2007/10/14 09:16:37 UTC
Feature request: easier property conflict resolving
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. For text
conflicts, users can use those diff tools, then call 'svn resolved' and
everythings ok.
For property conflicts, that's not possible, because there's no
'original' file which has the resolved property content.
Request:
have the svn_wc_entry_t struct extended with an entry containing the
original property content. Then, when 'svn resolved' is called, let the
svn_client_resolved2() API check for the existence of that file and if
it exists use the content of that file to set the property.
Reason:
Most (if not all) GUI diff tools don't know anything about SVN
properties but only deal with text files. Resolving a property conflict
should be as 'easy' as resolving a property conflict. While SVN UI
clients could make the property conflict data available as text files
before calling the GUI diff tools, there's currently no way for the diff
tool to write the resolved content into the property.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Feature request: easier property conflict resolving
Posted by Ben Collins-Sussman <su...@red-bean.com>.
On 10/14/07, Mark Phippard <ma...@gmail.com> wrote:
> On 10/14/07, Ben Collins-Sussman <su...@red-bean.com> wrote:
> > On 10/14/07, Stefan Küng <to...@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.
>
Sounds like a nice 1.6 enhancement. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Feature request: easier property conflict resolving
Posted by Mark Phippard <ma...@gmail.com>.
On 10/14/07, Ben Collins-Sussman <su...@red-bean.com> wrote:
> On 10/14/07, Stefan Küng <to...@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
Re: Feature request: easier property conflict resolving
Posted by Ben Collins-Sussman <su...@red-bean.com>.
On 10/14/07, Stefan Küng <to...@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?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org