I’m using the standalone version of TortoiseMerge (latest version) in a
script with the Subversion command line client. In this script I first do a
checkout from svn, then I apply a patch to my project with TortoiseMerge and
then commit the patched project back to svn. I have some questions regarding
this process.
1) Adding and deleting files
Using TortoisMerge to patch modified files is no problem, but for adding or
deleting files this doesn’t work directly. This is because my TortoiseMerge
standalone isn’t svn version aware. For example when a file is deleted with
TortoiseMerge the file is only deleted from my local file system, but the
.svn\entries file is not updated.
To workaround this problem I need to apply a svn add –force for the newly
added file from the command line. For deleting files I use the svn status
command to get the files marked as missing and then apply a svn delete. How
can I make the standalone version svn aware, so that it updates the
.svn\entries file directly? (By the way: When using TortoiseMerge from
within TortoiseSVN the adding works, but for deleting files the same problem
counts. In my case I can’t assume that other people using my script have
TortoiseSVN installed on their computer).
2) Don’t show pop-ups again and configure svn from TortoiseMerge
Standalone
On the TortoiseMerge help page there is some information about retrieving to
older files or other from SVN, but this doesn’t work for me. Every time a
newly added file, TortoiseMerge seems to try to look for SVN, but can’t find
it (My SVN is on a Red Hat server). It also show a pop-up that it can’t find
the original file, but that’s because it’s a new file. Is there a way to
turn off the pop-ups and configure the settings for searching for svn?
3) SVN patch command in 1.7
I'm now on 1.6.16 and will migrate to 1.7 when this is stable enough. SVN
1.7 provides more direct support for patching. Will it then also be possible
to apply a patch directly to svn (instead of choosing a directory where a
project is checked out)?
4) Remember user decisions
When I start TortoiseMerge without the command line parameters it pop-ups a
screen where I can choose between Merge and Apply unified diff. When I
choose Apply unified diff the next I start TortoiseMerge I doesn’t remember
my decision
5) TortoiseSVN and Subversive
In the FAQ there is a entry “TortoiseSVN does not work well with Eclipse”.
“Eclipse copies directories as part of its normal operation, and in a
subversion working copy it will copy the .svn directory as well. This causes
TortoiseSVN to think that there are versioned files in the bin directory.
If you want to keep using TortoiseSVN and just prevent this from happening,
you need to add '**/.svn/' to Eclipse's source exclude list.
But Eclipse has its very own subversion plugin called Subclipse, which makes
Eclipse SVN-aware and fixes the problem at source. You can find it at
http://subclipse.tigris.org/. After you install Subclipse you need to make a
fresh checkout. It will not fix checkouts that were made before it was
installed.”
Does this also count for the Subversive client? (Sometimes my Eclipse
crashed when importing from svn, killing TSVNCache.exe solves this problem)
6) GUI or Command Line
The SVN command line tool doesn’t have GUI of course. TortoiseSVN has
command line options, but you can’t really use it from command line. In
practice I sometimes want to popup a GUI and sometimes not. I would be nice
to use TortoiseSVN from the command line, so I can use for both cases. In
how far is Tsvncmd suitable?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2760329
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-08 10:29:35 CEST