Login | Register
My pages Projects Community openCollabNet

Discussions > dev > "resolved conflicts" on property conflicts

subcommander
Discussion topic

Back to topic list

"resolved conflicts" on property conflicts

Author Arnaud de Grandmaison <arnaud dot adegm at free dot fr>
Full name Arnaud de Grandmaison <arnaud dot adegm at free dot fr>
Date 2006-10-29 23:23:27 PST
Message Hi,

I noticed subcommander (version 1.2.1 and trunk) does not allow to use
the "resolved conflicts" when there is a property conflict.

As the subversion-1.2 manual says in the properties section of chapter
7 "Advanced topics" about property conflict:

> To resolve property conflicts, simply ensure that the conflicting properties
> contain the values that they should, and then use the svn resolved command
> to alert Subversion that you have manually resolved the problem.

This can be achieved thru the contextual menu "properties (ctrl+shift+P)".

Please find attached a patch to version 1.2.1, which applies also cleanly
against the trunk: it enables marking the property conflict as resolved.

And by the way, many thanks for subcommander ! This is the svn gui out-there I
feel the most comfortable with ;-)

Cheers,
Arnaud
Attachments

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

Messages

Show all messages in topic

"resolved conflicts" on property conflicts Arnaud de Grandmaison <arnaud dot adegm at free dot fr> Arnaud de Grandmaison <arnaud dot adegm at free dot fr> 2006-10-29 23:23:27 PST
     Re: "resolved conflicts" on property conflicts hauner Martin Hauner 2006-10-30 01:54:47 PST
Messages per page: