Simon Large wrote:
>> working copy: I made this the default in most dialogs. All it means is
>> that the operation goes as deep as the working copy is. Usually, that's
>> fully recursive. But if you checked out a working copy with a different
>> depth (e.g. you only want the folder itself, not all subfolders too),
>> then the operation itself will then use that depth. For update that will
>> mean it won't fetch the 'missing' folders but only update what's already
>> there. For merge, this means the merge won't pull in files/folders
>> outside the already present files/folders.
> Shouldn't this option be available in update-to-revision as well?
Unless you're using a build < 9038, it already is.
>>> Are any other dialogs affected?
>> Almost all which have to contact the repository.
> I meant are any other dialogs have changed function due to merge tracking?
No, only the merge and log dialog are affected.
>>> Client/Server compatibility probably comes into play somewhere.
>> Yes, for servers <1.5.x, some of the merge tracking features won't work
>> fully. For example, the new blame (try a very recent nightly build): it
>> will show the *merged* lines and that information (it's not really
>> useful to know that a line got changed in rX just because it got merged
>> - what's really interesting is the merged revision rY and that log).
>> When you get the blame info from a < 1.5.x server, the merge info is
>> incomplete: the revision/author/log message is still from the merge
>> itself. Only the path is shown (menu entry to activate the path column).
>> However when you talk to a >= 1.5.x server, the correct
>> revisions/authors/log messages are shown for each line.
> Is that a server change or a repo format change with 1.5?
It's a server change: the server stores the merge info in an SQLite
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Mon Sep 3 17:57:45 2007