[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: issues with merge depth

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 27 Jun 2011 20:26:19 +0200

On 27.06.2011 15:18, walter klust wrote:

> Thank you for the fast response.
>
> I installed "TortoiseSVN 1.6.99, Build 21624 - 32 Bit -dev, 2011/06/25 23:57:13" on a Windows 7 VM today to test this. Unfortunately I was not able to provoke such a warning message.
> I created a copy of a directory, changed depth to "immediate with children", created a hierarchy of directories in it, added them and then committed them. The commit did not throw a warning.
> Afterwards the copy still claimed to have depth "immediate with children" but it had also the fill hierarchy within it.
> Could you please look into this ?
> I would be glad to help test this issue with 1.6.99 versions; just give me notice.

With your steps, the warning actually should not appear, so it works
correctly.

You have a wc with a depth != infinity. But you then add folders, and
commit those folders. So the commit is still with depth infinity.
Even if you deselect the deepest added folder from the commit, the
warning should not appear because you already *have* those folders in
your wc, exactly the way they're committed. And the wc is after the
commit in the correct state.

However: if you rename/move an existing folder, then exclude the deepest
one from the commit, *then* the warning will show up.

Although I had a small bug in the code (fixed in r21628), so when you do
further testing, please use the next nightly build.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2778209
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-27 20:26:31 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.