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

Re: Understanding move & merge

From: Lele Gaifax <lele_at_seldati.it>
Date: 2003-01-17 12:09:44 CET

>>>>> On 16 Jan 2003 20:55:35 -0600, Ben Collins-Sussman <sussman@collab.net> said:

    BC> There's no good solution to this problem: the diff just
    BC> doesn't apply cleanly. There's no way Subversion can "guess"
    BC> that some file in your directory used to be named
    BC> 'main.c'... at least not without some huge brute-force search
    BC> heuristic!

Uhm, this is where I thought svn could help: I wrongly assumed that
"renames" were "first-class citizen" here :)

    BC> What were you expecting? :-)

    BC> Perhaps you're confused about how svn does renames. Remember
    BC> that a rename is an 'svn rm' + 'svn cp', and an 'svn cp' is
    BC> just an 'svn add' which remembers copy-history. So that's why
    BC> you're seeing the 'A' and 'D' in your merge there. It's a
    BC> rename.

Yes, and here you enlightened me on the matter: as said, I was
assuming that svn was able, in some way, to distinguish between a
rename and a "replace", but evidently it cannot.

Well, I dreamed for a while... back to work :-)

ciao, lele.

-- 
nickname: Lele Gaifax	| Quando vivr˛ di quello che ho pensato ieri
real: Emanuele Gaifas	| comincer˛ ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 17 12:10:35 2003

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