You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Sperling <st...@elego.de> on 2008/03/27 19:42:35 UTC
Need review for patch to merge_tests.py 61
Hi Kamesh,
I'm trying to fix tests that currently fail on the tree-conflicts
branch. One of the failing tests is merge_tests.py 61,
"merge fails if subtree is deleted on src".
The issue about this test failing on the branch is here:
http://subversion.tigris.org/issues/show_bug.cgi?id=3141
I have attached a patch to this issue that makes the test pass
again on the branch. I'd like to get feedback from you about
this patch. Do you think it breaks the test in any way?
There is a brief comment in the patch that explains why the test
creates a tree conflict, if you have any further questions about
this, please ask. I don't assume that you've been tracking the
tree-conflicts branch, so I will try to answer any questions
about this you may have.
Thanks :)
--
Stefan Sperling <st...@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
Re: Need review for patch to merge_tests.py 61
Posted by Stefan Sperling <st...@stsp.name>.
On Fri, Mar 28, 2008 at 06:50:49PM +0530, Kamesh Jayachandran wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Stefan,
>
> IIUC It is a Use Case 2 mentioned in tree-conflict's notes.
>
> I am fine with your patch.
>
> With regards
> Kamesh Jayachandran
Thanks!
/me goes off to apply the fix so
--
Stefan Sperling <st...@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
Re: Need review for patch to merge_tests.py 61
Posted by Kamesh Jayachandran <ka...@collab.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Stefan,
IIUC It is a Use Case 2 mentioned in tree-conflict's notes.
I am fine with your patch.
With regards
Kamesh Jayachandran
Stefan Sperling wrote:
> Hi Kamesh,
>
> I'm trying to fix tests that currently fail on the tree-conflicts
> branch. One of the failing tests is merge_tests.py 61,
> "merge fails if subtree is deleted on src".
>
> The issue about this test failing on the branch is here:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3141
>
> I have attached a patch to this issue that makes the test pass
> again on the branch. I'd like to get feedback from you about
> this patch. Do you think it breaks the test in any way?
>
> There is a brief comment in the patch that explains why the test
> creates a tree conflict, if you have any further questions about
> this, please ask. I don't assume that you've been tracking the
> tree-conflicts branch, so I will try to answer any questions
> about this you may have.
>
> Thanks :)
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFH7PCw3WHvyO0YTCwRAjHBAJ9rClrGRUKa33cAChcUGSvpFH0YWwCeKkLK
Oe673j1KSetFTi6ugRXjSBY=
=f5QI
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org