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

Re: svn commit: r31086 - trunk/subversion/tests/cmdline

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Thu, 08 May 2008 21:31:04 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>> Also, why should 'H_COPY/nu' have any explicit mergeinfo on it at the
>> end of this test? The final merge of the test a cherry harvest all
>> eligible revisions from 'A/D/H' to 'H_COPY' so no subtree of 'H_COPY'
>> should have any explicit mergeinfo right?
>
> Ignore that, right after I sent I saw that you removed the r2
> mergeinfo expectations in r31090.

No I deleted it in r31090 as my new test addition deletes H_COPY/nu upon
merge.

>My only comment now is that I think
> we can remove the cherry pick of r2 that you added to the test in
> r30929. This is an inoperative merge that doesn't even set mergeinfo
> since issue #3157 was fixed, so it serves no purpose in the test that
> I can tell(?).
>
> Paul

I added this '-c2' merge to make sure our '3067 fix in progress' has a
case for 'non-existent merge_src_rel_path_at_REV2'.

Yes both r30929 and r31090 exhibits 'non-existent
merge_src_rel_path_at_REV2'. But they are different in terms of 'location
segments between those revisions'.

- -c2 has no location segments for '/A/D/H/nu'.(introduced via r30929)
- -r1:9(Cherry harvest) has following location segments for '/A/D/H/nu'
[3-3], [5-7].(introduced via r31090).

With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIIyPA3WHvyO0YTCwRAp7AAJ9EYZLDb0GWi7b+P3ndQZeGOH29XwCfaRlt
XHxu8/0+lqfgjbNq/m7sySk=
=btxR
-----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-05-08 18:01:51 CEST

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