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

Re: Need review for patch to merge_tests.py 61

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Fri, 28 Mar 2008 18:50:49 +0530

-----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_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-28 14:21:37 CET

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