[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Tue, 05 Feb 2008 16:23:19 +0530

Kamesh Jayachandran wrote:
> Mark Phippard wrote:
>> 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.

Fixed in r29176 /trunk and proposed for 1.5.x.

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-05 11:53:37 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.