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

Re: Issue-2897 Branch

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 30 Jan 2008 12:56:38 -0500

I am going to post this in this thread because it is related.

Let's say that 1.5 is released without the issue-2897 branch included.
 If that is the case, we still need to decide how to handle reflective
revisions in 1.5. The choices just become more crude:

1) We include those revisions in the merge. That means we will be
repeating merge, but also not losing the parts not related to the
merge.

2) Skip those revisions in the merge. That means we will lose the
parts of the merge that were not related to the merge.

I would probably favor #1. I think we try to do some form of #2
today. I know that code had problems, I am not sure if it was
removed.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-30 18:56:52 CET

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