So let me see if I got this right.
- svn copy product/trunk_at_HEAD product/myfeature
- for each commit I already made
- svn merge -c -<revision-num> product/trunk
- commit the changes
At this point I'll have both branches where I want them.
Once my feature needs to go back to the trunk
- cd product/trunk
- svn merge myfeature .
Is that it ?
> -----Original Message-----
> From: Blair Zajac [mailto:blair_at_orcaware.com]
> Sent: Wednesday, December 03, 2008 2:47 PM
> To: Tyler
> Cc: users_at_subversion.tigris.org; Gilad Benjamini
> Subject: Re: Late Branching
>
> Tyler wrote:
> > On Wed, Dec 03, 2008 at 12:49:33PM -0800, Gilad Benjamini wrote:
> >> For a new feature I am writing, I added some code in our trunk,
> including
> >> adding new directories, a small number of new files, and minor
> modifications
> >> in existing files.
> >>
> >> A recent decision concluded that this feature should not be included
> in the
> >> trunk, but is expected to be part of the trunk in a few months.
> >>
> >> Meanwhile, I want to continue working on this feature in a separate
> branch.
> >
> > I would back ("reverse merge") your changes out of the trunk, cut a
> new
> > branch, then merge your changes original into that branch.
>
> Better yet would be to copy the branch from the trunk at HEAD (before
> reverse
> merging) then do only a single reverse merge of the commits that
> shouldn't be in
> trunk. No need to merge the changes into the branch.
>
> Blair
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979290
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-04 16:09:43 CET