[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, 29 Jan 2008 21:12:27 +0530

Mark Phippard wrote:
> Kamesh,
>
> It looks increasingly likely that SVN 1.5 will not include the branch
> you are working on. I am sending you this both to prepare you for
> that and also get your take on it. I think one reason the issue has
> even lingered as long as it has is that people have a lot of respect
> for the work you have put into this problem. I want to give you my
> take.
>
> You started working on this problem a long time ago, when it did not
> even seem solvable and you made some great progress. While you were
> working on the problem, the repository landscape completely changed.
> Mike made some major improvements by using the repository ancestry
> more and reducing the need for mergeinfo etc. This suddenly made the
> reintegrate solution possible. Dan and I spent a lot of time back in
> May exploring that solution and there were some major roadblocks based
> on how the design existed back then. Our conclusion then was that the
> reintegrate approach could not be done.
>
> The reintegrate solution seems like a lot simpler approach to solving
> the same basic problem. I suspect that what you are doing possibly
> solves a few additional scenarios, but they may be less critical (more
> edge-case) and we need to wrap-up 1.5.
>
> There are a couple of things you can do to help at this point:
>
> 1) Take a serious look at the reintegrate option and what it does. If
> there are common scenarios that it does not handle but that your
> branch will, then you need to articulate those scenarios as best you
> can.
>
>

I found the following differences(will add them as and when I find them).

1)If feature branch is not fully up-to-date with trunk(having sparse
merges), we will get faulty behavior.
   a)have /trunk/test.c (r1)
     tline1
     tline2
     tline3
     tline4
     tline5
  b)branch /b1 from /trunk(r2)
  c)In trunk change 'tline1'->'Tline1' and commit(r3)
  d)In trunk change 'tline2'->'Tline2' and commit(r4)
  e)merge r4 from trunk to /b1 and commit(r5)
  f)merge /b1 to /trunk <-This gives a spurious conflict

Issue-2897 branch does merge at f) correctly(Though it is broken due to
missing sqlite data, which I am *still* making a progress to implement
the FS based solution).

2)One has to learn one special switch to do the normal job(Of course job
is not *trivial* and hence worth to learn them)

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-01-29 16:42:44 CET

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