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

Merge of deleted file with a modified one

From: Alexey Yudichev <ayud_at_newmail.ru>
Date: 2006-01-07 00:03:20 CET

I am preparing a subversion demo for company developers and
architects. The demo includes merge with some files changed, some
deleted, some moved etc.
I discovered that if I
1) create a branch from trunk via svn copy
2) delete a file in branch and commit
3) modify the same file in trunk and commit
4) merge branch to trunk
I get the file deleted. Which means I lose my changes made in trunk. A
deletion, according to universal diff view, is equivalent to removal
of all lines of the file. I wonder if merge is diff-and-apply, how can
this diff cleanly apply to a modified file? Not all lines are the same
any more, there should be a conflict!
Is it a normal behaviour or am I missing something?

P.S. If I delete the file in the trunk and modify it in the branch, I
get "missing file ..." error, which is better than nothing and alerts
the user that there is a conflict.

Will be delighted to hear any comments. Thanks.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 7 00:05:26 2006

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

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