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

Problem tracking merges with retroactive branch

From: Benjamin Taylor <ben_at_broadcastpix.com>
Date: Mon, 20 Jun 2016 14:36:12 -0700 (PDT)

I have a branch "Foo" where source code for a derivative product (derived from the "Bar" product in the trunk) are tracked. Foo Version 5 was being developed, then stopped while new features and bug fixes for Foo Version 6 were added. I now want to create a branch for Foo Version 5 off a revision before Foo Version 6 feature commits were made, so I can merge just the bug fixes. When I create the FooV5 branch and bring up the revision log for Foo from the merge dialog, it shows no revisions unless I uncheck stop on copy/rename. When I uncheck, all revisions are grayed out as if they were merged, even though they have not been. I can select a revision and merge it, and all works as it should, but all revisions before the FooV5 branch commit are considered merged. Revisions after the branch are not grayed out.

I did find there were some files in sub directories with merge info in their properties - could this be the source of the problem, and is there a way to fix? Or is there some other way I should be doing this?

I thought I had used this process before without problems.

Thanks - Ben


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-06-21 07:42:22 CEST

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