[34326] trunk/dports

[Joshua Root]

Ryan Schmidt wrote:
> 
> On Feb 22, 2008, at 04:33, Joshua Root wrote:
> 
>> Ryan Schmidt wrote:
>>
>>> You should have used "svn mv" to rename pgpFullLicense.c-patch to
>>> patch-pgpFullLicense.c.diff. It looks like you just added it anew. Look
>>> the revision history now in the repository:
>>>
>>> http://trac.macosforge.org/projects/macports/log/trunk/dports/security/pgp/files/patch-pgpFullLicense.c.diff?rev=34326 
>>>
>>>
>>>
>>> See, it looks like the file just came into existence in r34326. But it
>>> didn't. It had a previous history that should have been preserved:
>>>
>>> http://trac.macosforge.org/projects/macports/log/trunk/dports/mail/pgp5/files/pgpFullLicense.c-patch?rev=21488 
>>>
>>
>> Sorry about that. The command I used was 'svn mv mail/pgp5
>> pgp', which seems to have worked as expected for the portfile
>> but not the patch.
> 
> Presumably you meant
> 
> svn mv mail/pgp5 security/pgp

Weird, I just checked and that's what the message said when I sent it. 
It must have been mangled somehow on its way to you.

> The problem is that it's tricky in Subversion to rename both a directory 
> and a file in it in a single step. You can't just do two "svn mv" 
> operations like this:

OK. I remember now that's what I tried to do. Probably easiest just to 
do it with 2 commits in future.

> I reconnected the history in r34361, like this:
> 
> cd security/pgp/files
> svn rm patch-pgpFullLicense.c.diff
> svn cp -r 34325 
> http://svn.macosforge.org/repository/macports/trunk/dports/mail/pgp5/files/pgpFullLicense.c-patch 
> patch-pgpFullLicense.c.diff

Neat trick. :-) Thanks for cleaning up after me.

Cheers,
Josh