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

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

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 18 Sep 2008 23:44:31 +0100

On Thu, 2008-09-18 at 12:53 +0000, Jojakim Stahl wrote:
> 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:

Hi Jojakim.

Thank you for this bug report. If you can spare a bit more time, please
could you see if there is already a test for this problem in our test
suite. Issue #1962 has a shell script attached, and it mentions recently
something about "all but 1 tests passing", but that change was reverted
and I don't know if there are actually any tests. If not, could you
convert your recipe into a test? That would really help.

>From reading some of issue #1962, it looks like this is quite a
difficult problem. It would be really good to get it fixed.
Unfortunately there don't seem to be any volunteers working on it at the
moment. Do you know anybody who could help?

Thanks.

- Julian

> 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
>

---------------------------------------------------------------------
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-19 00:44:50 CEST

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