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

Merge tracking bug?

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Tue, 14 Oct 2008 08:33:22 +0200

HI!

When I merge something from branch1/subfolder1 to branch2/subfolder2,
the merge tracking infos are being recorded in subfolder2 properties.

Now, when I do another merge on the same level, I can see in Show Log,
which revisions from branch1/subfolder1 are already there, because they
are grey.

But when I do another merge on the top level, from branch1 to branch2,
the revisions from previous merges on subfolders are NOT grey in Show Log.

On the other hand, if I do just Show Log (without merge) on branch2, I
can see all merges when I enable the "Include merged revisions" checkbox.

Why does it have the information from subfolder there, but not when I do
a merge?

Thanks!

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-10-14 08:35:35 CEST

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