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

Re: A merge question

From: Tom Lord <lord_at_emf.net>
Date: 2003-02-18 04:54:09 CET

> To be more specific, I'm thinking of a situation that is
> completely hopeless when using CVS (and many other systems).
> Let's say that the trunk is branched for a 1.0 release.
> After this branch, the directory structure of the trunk is
> reorganized by renaming and/or moving files around. After
> this stage a bug-fixed is commited to either branch, and
> needs to be merged to the other branch. If the change only
> affects a single file, it is quite easy to do it manually,
> but if the change spans several files, it becomes a real pain
> to do manually.
>
> Are there any plans to add such support to Subversion?

       Yes, but not before 1.0. We track more history than we use,
       currently. Getting Merge Right is an ancient and venerable
       topic on this list

I'm confused here because I thought svn _already_ had a more positive
answer to that question. Is it possible that you misunderstood the
question?

Supposing I form a branch and, within the branch-from revision, rename
`foo.c' to `bar.c'. In the branched-from area, `bar.c' continues to
evolve. Is it really the case that you currently provide no automated
mechanism to apply the `bar.c' changes to my `foo.c'? Or for that
matter to merge the renames from branched-from to branched-to?

-t

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 18 04:43:49 2003

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