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

How to handle repeated merges to/from trunk

From: Chris Wein <cwein_at_mobilygen.com>
Date: 2004-07-16 18:46:15 CEST

I have a problem maintaining long-lived feature branches. The working
model I would like is to branch at a specific revision and then
periodically merge in new changes on the trunk into my feature branch as
the trunk continues to move forward. After several of these merges, the
feature is done and I would like to merge/commit the new feature back to
the trunk. The problem I am seeing is that any conflicts that were
resolved going from the trunk to the branch reappear as conflicts going
back to the trunk. Now, I am sure that the to-be-scheduled (when is
that btw? svn 2.0?) maintain merge history feature will resolve this but
in the meantime, what can I do to eliminate these conflicts? I am not
sure how do this, even by remembering the revision ranges I merged from
the trunk. :-(

Any ideas?

Chris Wein
Software Manager
Mobilygen Corp.
E-Mail : cwein@mobilygen.com
Phone  : 408-869-4035
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 16 18:47:02 2004

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.