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

Selective merging of features from a development branch

From: andy <andy_at_quarch.com>
Date: Thu, 26 Nov 2009 04:31:35 -0800 (PST)


I've got a bit confused, hope someone can help!

I have a 'Trunk' branch that contains stable code at version 1.4
I have a 'Dev' branch (committed) that contains a month of development
work that adds several new features. The features were added in
parallel, so there is no revision number that would include a complete
feature A but none of feature B....

I want to merge feature A into the trunk. It is spread across several
files that also contain feature B. If a do a normal Reintegrate merge,
I get all the changes from both features in the Trunk. How can I do a
manual merge so I can choose which changes I want to keep and which
should be left behind? Is this even possible in Tortoise?

I am imagining doing it like using the conflict resolution window...In
fact I was expecting to Tortoise conflict all the files as they were
different to what was in the Repo but it dosen't!

I could do a manual compare of every file with WinDiff and copy/paste
the changes, but I was hoping for something a little faster...

Any suggestions greatly appreciated.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-26 13:35:45 CET

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