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

need advice on merges

From: Mark Ng <z3r0.00_at_gmail.com>
Date: 2005-02-13 13:09:52 CET


I am making a number of local enchancements to a upstream source. All
of the enchancements are orthogonal to each other so they go into
different branches, for ease of management and focus. Also, I've a
"full-flavoured" branch that merges in all the local enchancements
into one. None of these enchancements will be going into upstream as
they're either too specialised or hacky.

My question is how should I manage changes from upstream ? If I merge
the changes from upstream into all of the branches, then when it comes
to updating the full-flavoured branch there would be lots of

Any suggestions or recommendations on how I should manage the branches ?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Feb 13 13:12:13 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.