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

Re: Error showing differences from log at branch creation

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Thu, 24 Jan 2013 15:35:18 -0600

On Thu, Jan 24, 2013 at 8:50 AM, BIRD Neil <Neil.Bird_at_uk.thalesgroup.com> wrote:
> If I create a branch *with changes* (e.g., copy modified working copy to branch), then TortoiseSVN has problems showing the changes that occurred as part of the copy.
> In such a branch, when showing the log up to the point of the copy, modified files show up correctly as changed, but double-clicking them as normal brings up windows for all the autoprops (which is a bit of a pain, if technically correct) and then complains about the file not existing.

I don't have an example of your situation, but the similar situation
of a rename with modifications works fine for me.

> So far as I can see, it's trying to diff the first version of the file in the branch with the previous version *in the branch* (which of course didn't exist) as opposed where it was copied from.

It's possible SVN doesn't expect you to make changes on the branch
operation so it takes shortcuts trying to come up with a previous
revision, I don't know. Underneath, it is a copy-with-history
operation, which is the same as a rename, so I'm surprised rename
works but branches don't.

> I have just discovered that if I show the log of the branch, and do not stop-on-copy, then select the revision just before the copy and also that of the copy, I can select the file and choose “show changes”. *This* method does show the changes I'd like to see.

At least you have a workaround, I guess. What if you double-click the
file in the first branch revision, when you do not have stop-on-copy
selected? Obviously TortoiseSVN has the required data to do what you
want, I'm perplexed why it wouldn't.

> So I guess the question is: is it a bug or just me? I just updated to 1.7.11 and it behaves the same way (for me).

I think I'd consider it a bug. But then, my advice is actually "don't
do that". Why do you find it necessary to branch from a modified
working copy? You could just as easily branch from the parent revision
of the working copy, switch to the branch, and take your uncommitted
changes along with your working copy to commit later. I think this is
the usual method, and probably better supported seeing as how
branching from a repository revision is the default selection on the
branch dialog.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-01-24 22:35:45 CET

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