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

Summary of discussions that occured on issue 2897 -Part 1

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-07 11:04:52 CET

Hi All,
First of all my sorry for not able to cope up with flood of emails on
this issue 2897.

Mark has posted this email
http://svn.haxx.se/dev/archive-2007-11/0729.shtml asking for
clarifications on 2897.
He considered 3 classes of problems
a)synch up merge from /trunk to feature branch + conflict resolution +
committed at rX
   When we merge feature branch back to /trunk will conflict resolution
be lost?

My Answer: Yes, as of now in issue-2897 branch, I am working on
extracting 'conflict resolution changes'.
I term the solution to the problem 'merge *non-reflected* changes from a
*reflective* revision'.

Consider we have 2 feature branches FB1 and FB2
   FB1 has merged rS from /trunk and committed at rX
   FB2 has merged rS from /trunk and committed at rY1
   FB2 has merged rT from /trunk and committed at rY2
b) MERGE /FB2 to /FB1 and committed in rZ, Will this merge consider rY1
as *indirect* repeat merge or rX?
    No. I hope it is not the goal of issue-2897 atleast as of now.
c)Will MERGE /FB1 to /trunk consider rZ as reflective REV?
Yes. It considers merges on /FB2 as a merges on /FB1 due to implicit
property merges on rZ. Still there exists one problem which I can
attribute to 'merge *non-reflected* changes from a *reflective*'.
As of today in issue-2897@28322 branch we filter rZ too and hence we
loose /FB2 *only* changes.
'merge_non_reflective_changes_from_reflective_rev' testcase in
'merge_tests.py'@issue-2897 branch deals with it.

There were other threads few of them I sparsely looked at and they went
over my head.

As of now all I can say is that there exists a problem 'merge
*non-reflected* changes from a *reflective*' that need to be fixed to
fix a) and c).

I will post one more summary after going through the posts of Folker
especially his concerns over branchA->branchB->branchC'.

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 7 11:04:26 2007

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.