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

TSVN gives no warning when merging when the target file has been deleted

From: Erik Hemdal <erik_at_comprehensivepower.com>
Date: Thu, 23 Oct 2008 12:36:54 -0400

Problem: TSVN is silent when I try to merge a file from trunk to a branch
where the target file has been deleted. It doesn't give
any message about the file in the list of changes until the branch is merged
back to trunk.

Expected: TSVN shows a message like "Skipped missing target", or adds the
file on the target branch, or shows a conflict.

Questions: Is this an ambiguous case, or a user error? Should I have
expected TSVN to warn at R105 in the test case below?
Is there a reliable way to avoid this, other than due diligence when
merging?

Test case:

Trunk at R100 contains fileA, fileB, fileC.

R101: Create Branch by copying from trunk.
R102: Add a line to fileA on Trunk.
R103: Delete fileC on Branch.
R104: Add a line to fileB on Branch.
R105: Merge R101-102 from trunk into Branch. I see the change to fileA.
TSVN is silent about the deleted file.
R106: Merge changes from HEAD of trunk to HEAD of Branch into trunk. I see
that the added line appears in fileB, and fileC is removed.

At R106, trunk and Branch are identical. But I expected to see a "Skipped
missing target" message at R105, and I did not.

I can reproduce this behavior with the native client, too. So my first
guess is that I did something wrong.

In the archives, I found

http://svn.haxx.se/dev/archive-2006-03/0918.shtml

which sounds like a related problem that was repaired in SVN 1.4, and

http://svn.haxx.se/users/archive-2006-01/0325.shtml

which seems to suggest that this might be a limitation concerning renames as
"delete, then add".

Thanks for taking the time to consider my question. Erik

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-23 18:56:39 CEST

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