RE: need advice on merges

-----Original Message-----
From: Mark Ng [mailto:z3r0.00@gmail.com]

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
conflicts.
---------------------------------------------------------------------

In most cases, when the same change shows up on both versions that are being
merged, svn is clever enough to not consider it a conflict.

As for organization, I'd set up a vendor branch for the upstream code base,
and merge it into your four development threads in the standard way for
vendor branches. Merging the four development threads into the "full
flavor" version shouldn't be too bad.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 14 16:23:12 2005