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

Re: Can subversion track structural changes? In different copies? And merge them?

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-09-07 16:11:27 CEST

On 9/7/06, Mariano Kamp <mariano.kamp@acm.org> wrote:
> Garrett Rooney wrote:
> > On 9/7/06, Mariano Kamp <mariano.kamp@acm.org> wrote:
> >> Otherwise this would mean that all svn users don't use branches and
> >> merge automagically. Or they don't do any structural changes, besides
> >> adding new files.
> >
> > No, it just means that significant tree rearrangements can screw up
> > merging, and people have lived with that for now. Yes, it sucks.
> Sorry for being so annoying, but any change in the structure, besides
> add, that will be effected in more than one tree will cause this, right?

Potentially, yes.

> > Sorry. Hopefully it will get better in the future.
> No offense meant. Just wanted to understand the situation.
>
> Anyway, Garret, from what I read in the bug report you are working on it
> right now for 1.5. Do I understand it correctly, that after your
> significant fix / new feature you can do all sorts of structural
> changes, e.g. moving directories, and still can automatically merge?

I'm working on it, but considering the scope of the change it's
unknown if it will be in 1.5, or if parts of it do make it in to 1.5
if it will be visible to the user or not. There are several stages to
the rename support, and the first few of them are very low level, not
the sort of thing that anyone other than a developer would notice.
It's only after those are in place that we can actually use them to
solve the more interesting problems.

> What is the best guess for the release date of the 1.5 release? First
> half of '07 or second half?

It's impossible to say at the moment. We haven't even got 1.4 out the
door yet, so predicting when 1.5 will come out is just an exercise in
futility.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 7 16:20:12 2006

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