Hi,
ok, using ur suggestion slightly changes the question to: "How to
determine whether a merge failed?".
I've tested "svn update" as well as "svn status" but both return 0, even
if there's a conflict.
The only solution I could think of is parsing the output of "svn status"
to check whether it reports any merge conflicts (aka using a python
script or somesuch).
Anybody having an easier solution/idea at hand?
Regards,
Stefan
>>> is there a way to get TSVN to behave a bit more "quiet" if we call the
>>> TortoiseProc.exe via the command line? Something like: Only display the
>>> GUI, if there needs to be user-interactions (like in cases where there's
>>> a conflict, which cannot be merged automatically)?
>>>
>>> Reasoning:
>>> We call TortoiseProc.exe in a batch-file on several folders to update
>>> these. That pops up the GUI several times which is a bit
>>> annoying/inconvenient for our user-base.
>>> We chose to use TortoiseProc.exe instead of svn.exe, since we wanted to
>>> be presented with a GUI in case of merge conflicts, and don't have to
>>> work with the ASCII-command-line view of svn.exe.
>>>
>>> I understand that the argument is that TSVN is a GUI-tool and hence it
>>> "should" pop-up the window. But for our use-case it's really something
>>> we'd like to improve for our user base. Is there any way to get that done?
>> You could invoke TortoiseProc.exe with the command :repostatus after a
>> merge has failed. More info here:
>> <http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-automation.html>
> Great, that sounds like a viable alternative for us. We'll give it a try.
>
> Regards,
> Stefan
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2717347
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>
>
> -----
> No virus found in this message.
> Checked by AVG - www.avg.com
> Version: 10.0.1209 / Virus Database: 1500/3553 - Release Date: 04/05/11
>
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2717355
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-06 13:28:25 CEST