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

Re: ancestry accounted for in merge?

From: Mark Phippard <markphip_at_gmail.com>
Date: 2006-12-23 00:31:16 CET

On 12/22/06, deckrider <deckrider@gmail.com> wrote:

> I was thinking that in Subversion 1.4.2, it was going to consider
> history/ancestry more fully. And perhaps it does, but I was looking
> for it in the merge. Please see the attached script for an example of
> what I wanted to do.
>
> Perhaps I am incorrect in my approach and someone can help me know the
> right way to account for renames and other kinds of refactoring that
> happens in a project when it is time to merge?

I did not look at your script, but I assume from your comments that
what you were looking for was changes to a file that was renamed to
follow the rename and apply the changes to the file with the other
name during the merge? If so, Subversion does not have this
capability. See this blog post I recently wrote for a little more
details:

http://markphip.blogspot.com/2006/12/subversion-moverename-feature.html

Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 23 00:31:49 2006

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