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

svn merge revert commit adds files to the repo that are missing in the wc

From: Jojakim Stahl <joja.lists_at_jojakim.de>
Date: Thu, 18 Sep 2008 12:53:21 +0000 (UTC)

Hello all,

I multiple times now had the problem, that I had files in the repo that were
not in the wc any more. I now found the reason:

1.
Merge a changeset X from p1 to p2, where X was
A dir1
A dir1/file1.txt
A dir1/file2.txt

svn merge -c X p1 p2

2.
Merges marks file1.txt as added, but for some reason in p2 I do not need
file1.txt any more (due to some restructuring or something else). Therefore
revert file1.txt

svn revert p2/dir1/file1.txt

3.
Commit p2

svn ci p2 -m "Merged dir1 from p1"

4.
svn status reports file1.txt as unversioned now. Therefore delete file1.txt

del p2/dir1/file1.txt

5.
svn status reports nothing now, also svn status --show-updates doesn't show
anything. Aswell, svn up reports that the wc is up to date. However, svn ls
p2/dir1 reports file1.txt to be in the repo.

I struggled may times over this problem now. Especially because you do not see
that the repo has someting that is not in the wc. And if you take p2 as base
for other merges now, you get the file1.txt duplicated to pX.

I search the bug database and found #1962 to be probably the reason of the
problem. But #1962 is scheduled consider-1.6. I'm wondering whether such a
fundamental bug in merging shouldn't be fixed as soon as possible (next 1.5
fix?). Aren't others dealing with such problems, too?

The problem in reality is: Your wc is compiling well and you commit. Others
update there wc and your commit breaks their wc compiling. This happens one
time, two time, and then your boss will ask you some questions...

Thanks,

Jojakim Stahl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-18 15:00:27 CEST

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