Yuri <y...@rawbw.com> writes: > The major difference is that this file has two records in "Bad DB" and > only one record in "Good DB". Bad DB has an extra record with > op_depth=4 and 'base-deleted'. > > I never deleted those files, I added them myself locally because they > are new, but never checked them in.
That would cause update to raise a tree-conflict on the file and mark it as base-deleted. > And even if they were in local > pending delete state, new files with the same path coming from the > repository with update should at least cause the conflict. It's in a "pending delete state" because that's what happened when the tree-conflict was raised. Either the tree-conflict is still present or you resolved it by accepting the current state. Either way the deleted file can be restored by running 'svn revert path/to/file'. Running update in the current state doesn't generate another tree-conflict because the file is already present and marked for deletion. -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*
