[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: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 20 Feb 2009 15:02:42 -0500

On Fri, Feb 20, 2009 at 2:56 PM, Brian Erickson
<erickson_at_bauercontrols.com> wrote:
> So, since I've already messed up ...
>
> What happens to the existing working copies when I delete and re-create
> the branch?
>
> IMHO: If re-integrate means you're done, Subversion shouldn't allow any
> more commits to the branch. It should probably delete it when the
> reintegrate succeeds.

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
linked to is more detailed. Deleting and recreating the branch is
just a simple workflow to remember. As I indicated, you can use
--record-only to mark a revision as merged, that is just too
complicated to explain a book aimed at new users.

Merge would not delete the branch because a merge is not a commit.
And commit would not delete it, because it does not have any real
merge knowledge.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200292
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 21:03:42 CET

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