On Tue, Jan 20, 2009 at 12:45:42AM -0800, golandav_at_yahoo.com wrote:
> I would appreciate any update about how SVN is going to handle
> moved\renamed files in the future (and current status if possible).
> Currently if you merge such file\folder you are loosing all your
> latest work on branch (not the history) without any warning.
I think your problem (which you did not describe in any detail,
so I might be totally wrong here) should be addressed by a new
feature called "tree conflict detection", which will be included
in the upcoming Subversion 1.6 release.
Unfortunately there is not much documentation for this feature as
of yet. I am working on this, a small bit of information has already
been added to the svnbook for 1.6:
That section still needs to be extended with examples.
You might be interested in these slides for a talk Stephen Butler
and myself gave at Subconf:
(Some of the graphics-slides are missing in the PDF, I don't know why.
Someone must have done something wrong when converting the power
point file to PDF. Also, the example output you can see on these
slides looks a lot different now.)
If you can, please install Subversion from current trunk, and test
your problematic scenarios with it. You will likely see different
behaviour than with 1.5. The feature will soon be released with
Subversion 1.6, and the sooner we get feedback for this new feature
the better it will be when (and after) 1.6 is released.
Your feedback would really help us a lot.
Received on 2009-01-20 16:11:58 CET