Re: merging a branch to the trunk

On Tue, 2006-03-21 at 09:48 -0700, Craig White wrote:

> > You need to get the revision number at which you created the branch.
> > As someone else already said, use "svn log --stop-on-copy" on the
> > branch to discover that. Then merge from that revision to the most
> > recent revision of the branch. So for example if you discover using
> > "svn log --stop-on-copy" that you created the branch in revision 10,
> > and now it's revision 20, then that means you want to take the list
> > of changes performed between revisions 10 and 20 of the branch, and
> > perform them on a working copy of the trunk. Therefore:
> >
> > cd /home/craig/svn/th-db/trunk
> > svn merge -r10:20 \
> > svn+craigssh://craig@srv1.example.com/home/craig/svn/th-db/branches/
> > phase2
> ----
> excellent - I wouldn't have connected the 'svn log --stop-on-copy' to my
> trying to merge but indeed, that told me that I only needed to merge
> from revision 14 to 20, dry run log looks to be what I want and I'm
> throwing all remaining caution to the wind.

----
OK - now I am a little lost here and I'm wondering the best way to
handle this.
after the merge, I've got...
$ ls app/controllers/application.rb*
app/controllers/application.rb
app/controllers/application.rb.merge-left.r14
app/controllers/application.rb.working
app/controllers/application.rb.merge-right.r20
and I'm certain that I want the revision 20 version. What is the proper
way to handle this?
I have been using kdesvn for a visual look which runs Kompare for diffs
but they won't save and put some code in /tmp/kde-craig/... but that is
of no value to me.
How do I get it all merged down to the last revision and remove all the
cruft so I end up with just application.rb ?
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org