[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 15:51:41 CEST

On 9/7/06, Mariano Kamp <mariano.kamp@acm.org> wrote:
> Erik Huelsmann wrote:
> > On 9/7/06, Mariano Kamp <mariano.kamp@acm.org> wrote:
> >>
> >> please consider the following scenario. A file in trunk is renamed,
> >> but in a branch changes to the same file are also made.
> [..]
>
> > This is issue 898: Implement true renames. Because renames are
> > currently implemented as a Copy+Delete, it's not possible to determine
> > whether a file stems from a Copy or Rename operation.
>
> >> I am really at a loss here, can somebody open my eyes please? ;-)
> Well, sorta ;-)
>
> I read the issue report,
> http://subversion.tigris.org/issues/show_bug.cgi?id=898, and it has been
> filed four years ago. So that lets me believe the feature is not
> important at all. Hence I am probably doing something the wrong way and
> there is an easy workaround for tracking changes in resource names and
> directories.

It's not that it's not important, it's just that it's hard to do.

> The question is, what does the workaround look like?
>
> 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. Hopefully it will get better in the future.

-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 15:57:39 2006

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