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

Re: Modifications lost when file is moved

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-08 22:50:44 CEST

On Jun 8, 2005, at 12:38 PM, Tim Blackman wrote:

> I've run into a case where file modifications are not merged correctly
> when there is parallel development and a file is moved.
>
> Here's the case:
>
> Developer 1: Move file, modify file, commit
> Developer 2: Modify file, update
>
> When developer 2 updates their working copy, their modifications to
> the
> file don't seem to be included in the merged copy. Instead, 'svn
> status' shows their copy of the file, under the old name, marked
> with a
> '?', and the copy with the new name only reflects changes from
> developer
> 1.
>
> Is this known [mis]behavior? Am I misunderstanding something?
>
> Here's my environment:

Subversion doesn't yet have true moves, it has copies & deletes. The
server is sending a delete/add combination to developer 2 when he
updates.

This issue describes what you're seeing:

http://subversion.tigris.org/issues/show_bug.cgi?id=2282

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 8 22:55:34 2005

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