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

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

From: Brian Erickson <erickson_at_bauercontrols.com>
Date: Fri, 20 Feb 2009 15:48:12 -0500

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.

> -----Original Message-----
> From: Mark Phippard [mailto:markphip_at_gmail.com]
> Sent: Friday, February 20, 2009 3:21 PM
> To: Bob Archer
> Cc: Brian Erickson; users_at_subversion.tigris.org
> Subject: Re: Fwd: svn1.5 seems to fail simple merge-tracking scenario
> On Fri, Feb 20, 2009 at 3:10 PM, Bob Archer
> <Bob.Archer_at_amsi.com> wrote:
> >> I wrote the text that was quoted, and it is not as absolute as has
> >> been made out. You can still use the branch. The blog you were
> >
> > But you can't reintegrate it, right? Which kind of makes it
> unuseable.
> Sure you can. This works:
> $ svn co ^/branch1
> $ svn ci -m "work on branch"
> $ svn merge ^/trunk
> $ svn ci -m "Catch up with trunk"
> On trunk WC
> $ svn merge --reintegrate ^/branch1
> $ svn ci -m "Commit all work from branch1"
> Committed revision 100
> Back on branch1
> $ svn merge --record-only -r100 ^/trunk
> $ svn ci -m "Mark r100 as merged"
> $ svn ci -m "More work on branch"
> $ svn merge ^/trunk
> $ svn ci -m "Catch back up with trunk"
> Back on trunk
> $ svn merge --reintegrate ^/branch1
> $ svn ci -m "Commit all work from branch1"
> Committed revision 200
> Lather. rinse. repeat.
> --
> Thanks
> Mark Phippard
> http://markphip.blogspot.com/


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 21:49:06 CET

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.