Re: Fwd: svn1.5 seems to fail simple merge-tracking scenario

On Fri, Feb 20, 2009 at 3:48 PM, Brian Erickson
<erickson_at_bauercontrols.com> wrote:
> Good lord this is complicated. Subversion doesn't seem to be doing a
> good job making my life easier. I always knew exactly what to do when
> we used PVCS. Now, I find myself deleting the .svn folders and copying
> files way more than makes me comfortable.
>
> It seems that's what I have to do to clean up my mess.
>
> This morning I reintegrated from a branch (./branches/TRHistoryWnd) back
> into the trunk (./trunk/pcs). Since, then at least 2 of us have
> committed changes into the branch.
>
> It seems like what I need to do is:
> 1) Checkout the TRHistoryWnd branch and delete all the .svn folders.
> 2) Delete the TRHistoryWnd branch
> 3) Create a branch call TRHistoryWnd
> 4) Checkout the new TRHistoryWnd branch
> 5) Copy the tree made in step on over top of my new working copy
> 6) Commit back to my branch.
>
> 7) Don't ever re-integrate until you're completely done.
>
>
> Thanks for your attempts at helping me.

There is no question that you do NOT have to do what you are doing,
and I doubt anyone here would have suggested that.

You do not say what you want to do, but if you want to get those two
revisions from the branch to trunk, the simplest way is to just name
them.

Let's assume the two revisions committed were 100 and 105.

From a trunk WC:

$ svn merge -c100,105 ^/branch/TRHistoryWnd
$ svn ci -m "Merge r100 and 105 from TRHistoryWnd"

Then delete and optionally recreate the branch.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200511
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].