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

Re: Unexpected merge left intentionally deleted line in place

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Wed, 4 Apr 2012 22:59:44 +0100

On 4 April 2012 20:07, Dave Reed <dreed_at_cmal.com> wrote:
> I committed a file after deleting a line of code.
>
> On another machine I then updated the same file.
>
> But, instead of replacing the file with the latest revision, a merge was performed -- without asking me.  This merge kept in place the line of code I was trying to delete.

The fact that it merged instead of replacing means that the file on
the second machine already had local changes at the time you did the
update, so it had to merge the changes bright about by the update with
the ones already made locally.

But there is no logical reason why the deletion of a line would not be
included as part of that merge. If that change were in a part of the
code modified locally then you would have seen a conflict on merging.
You need to do a diff of the file on machine 2 to see if the deleted
line has been put back in somehow. And maybe you should look at the
log for that file and diff the change that you committed. Maybe it
didn't really include the deletion you thought you had made, e.g. the
file wasn't saved before making the commit.

Sorry if that sounds really obvious, but the situation you describe
just doesn't happen normally with Subversion - it would be completely
useless as a revision control system if it did - so it looks like
something else has happened which you've not told us about, were not
aware of, or someone else did without telling you.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2944687
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-04 23:59:52 CEST

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