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

Merging in presence of renames

From: Vladimir Prus <ghost_at_cs.msu.su>
Date: 2002-09-25 13:56:12 CEST

I'm not sure if this behaviour is right or wrong, however:
Say I have directory "src" with file "main.cpp" in it.
I do:

   svn cp src src2
   cd src2
   svn mv main.cpp hello.cpp
   edit hello.cpp
   svn ci -m ""
   cd ../src
   edit main.cpp
   svn merge -rX-1:X ../src2

(Here X is the revision created by commit).

This fails: svn tries to delete "main.cpp", which is locally modified in
src. I would expect that svn notice that main.cpp was renamed in branch,
and merge local mods of main.cpp with hello.cpp from branch, silently
deleting main.cpp. Is this a reasonable expectation?

- Volodya

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 25 13:57:59 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.