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

Re: Moving and merging

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-01-19 15:05:09 CET

On 1/17/07, Renaud Kauffmann <renaud.kauffmann@xilinx.com> wrote:
>
> I am going through bug filling process and sending this email out to see
> whether this a known issue.
>
>
>
> I am working on trunk with two sandboxes updated to the last rev. In the
> first one I move a text file from one directory to another and check this
> change in. ( I made sure that both the source and destination folders are
> checked in, I am actually checking in the entire sandbox )
>
> In the second sandbox, I am modifying this file and not moving it. I then
> perform an update. What I see is that SVN is moving the file but it is not
> merging the changes in. My changes were lostů
>
> Is this a known issue ?
>

That is how Subversion works. I have a blog entry about it, hopefully you
will find it helpful:

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

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on Fri Jan 19 15:05:30 2007

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