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

RE: Keeping a branch updated

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-09-01 18:34:06 CEST

Read the sections on branches, tags, and merges
in the manual to get you started...

>-----Original Message-----
>From: Andrew Durdin [mailto:adurdin@gmail.com]
>Sent: Friday, September 01, 2006 12:13 PM
>To: users@subversion.tigris.org
>Subject: Keeping a branch updated
>
>This is the second time that this conundrum has turned up for
>me, and I haven't figured out the answer yet: I'm working on
>a branch of a project that is implementing a large feature.
>Part way through its development, I notice that there are
>significant changes in the trunk that will cause a conflict
>with my code when it's merged. To keep on top of this, and
>keep the future conflicts as small as possible, I want to
>incorporate this change (or perhaps all the trunk changes up to this
>point) into my branch, so that it doesn't get too far out of
>sync with the trunk. Now, this might happen several times
>during the lifetime of the branch.
>
>When the feature is completed, and it comes time to merge the
>branch features back into the trunk, what's the best way to
>approach it? If I just try to merge the whole branch's
>history, then I get conflicts due to the same changes (that
>were synchronised) being present in both the trunk and the
>branch. If I try to merge the history between
>synchronisations of the branch (first from creation up to the
>first sync, then after the first sync to the second sync,
>etc.), then I end up having to again resolve the conflicts
>that I resolved at each synchronisation.
>
>Is there a better way to manage this process?
>
>Andrew
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 1 18:37:35 2006

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