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

Re: Merge bug causes changesets to be applied although this should not be the case

From: Fredrik Orderud <forderud_at_gmail.com>
Date: Tue, 6 Aug 2013 22:40:02 +0200

On Tue, Aug 6, 2013 at 3:19 PM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:

> FYI, another user complained about this on the users list (Fredrik
> Orderud, CC'd) [1]. He has filed issue #4405 [2]. Perhaps some of the
> interested parties here can take a closer look? Or maybe Fredrik or
> anyone can start / continue discussion to go towards a detailed
> specification of the behavior of such an optional 'strict' flag or
> something like that ...
>
> (no specific interest myself, just trying to tie some loose ends together)
>
> [1]
> http://mail-archives.apache.org/mod_mbox/subversion-users/201308.mbox/%3CCAHGmiisrngb1sogdLhKkY+9ePuNqVjZ8V7J_LyfAkxezZ54fJw@mail.gmail.com%3E
>
> [2] http://subversion.tigris.org/issues/show_bug.cgi?id=4405 (Merge
> order affects final result for repeated added & deleted changes)
>

I've now written an XFAIL test for merging the same change change twice.
Patch attached. The test fails as expected due to the lack of conflict.
This is the first test I've ever written for subversion, so there are
probably some improvement opportunities. I suspect that one weak spot is
that a "greek-tree" structure is generated without being used in the test.
Also, comparison of console output for merge results feels a little fragile.

Please let me know if there are any comments to the patch, and I'll do my
best to improve it. Otherwise, it would be great it the test could be
integrated, so that issue #4405 can receive some test coverage.

Thanks in advance,
Fredrik

Received on 2013-08-07 07:07:01 CEST

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