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

Understanding move & merge

From: Lele Gaifax <lele_at_seldati.it>
Date: 2003-01-17 02:07:15 CET

Hi all,

I'm trying to understand the mechanism of merge when coupled with
renames and deletes. It seems that the merge command completely
ignores the rename operation, giving unexpected results.

To test the case, I supposed to have to track an external sw, the
"third-party" model:

/vendor
  /current
  /product-1.0
  /product-1.1
/mine
  /current
  /enh-product-1.0
  /enh-product-1.1

PoW A: for whatever reason, I decided to rename the source "main.c"
       to "product-main.c".

Where "product-1.2" gets released, I do the merge: argh! they modified
"main.c", and I obtain:
$ svn merge svn://.../vendor/product-1.1 svn://.../vendor/product-1.2
svn: Can't find an entry
svn: svn_wc_merge: `main.c' not under revision control

PoW B: this time, the *vendor* renamed that file, while my version
       still has "main.c", a customized version of 1.1

At merge time, *my* changes to main.c aren't honored:
$ svn merge svn://.../vendor/product-1.1 svn://.../vendor/product-1.2
A product-main.c
D main.c

At this time, my changes are silently gone.

Am I missing something, or the move operation, on either sides,
doesn't fit merge capabilities?

Thanx for this great software, and in advance for any hint :)
bye, 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 02:07:59 2003

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