[ciphershed] Re: Old TrueCrypt history pull request.
- From: Stephen R Guglielmo <srguglielmo@xxxxxxxxx>
- To: ciphershed@xxxxxxxxxxxxx
- Date: Mon, 30 Jun 2014 10:27:09 -0400
On Sat, Jun 28, 2014 at 5:35 AM, Jason Pyeron <jpyeron@xxxxxxxx> wrote:
>> -----Original Message-----
>> From: Stephen R Guglielmo
>> Sent: Friday, June 27, 2014 12:23
>>
>> On Fri, Jun 27, 2014 at 12:22 AM, Jason Pyeron
>> <jpyeron@xxxxxxxx> wrote:
>> >> I've been trying to follow what you did there, Jason. The
>> source for
>> >> 7.1a is now in src/, right? So if your pull request is merged, it
>> >> would prevent my pull request with all the rebranding from being
>> >> merged?
>> >>
>> >> Do we need all the scripts in etc/ and bin/?
>> >
>> > No. I have been unable to update my pull request, and it
>> will not let me make
>> > another. Can you delete the pull request so I can
>> re-request with the cleaned up
>> > version. Correct head to pull -
>> b60070f4d0879e277f44d174a163bbb292325fea .
>>
>> It looks like it's there. That commit is included in the pull request
>> #13. I'm still concerned that it will prevent all the rebranding (pull
>> request #11) from being merged though...
>
> Got it. It is simple :) Sometime I wonder...
>
> # http://pastebin.com/TuqhYubH # incase the script gets all screwy in email
I ran this and checked it all and it seems to be perfect. Git blame
works (for the history) and all the re-branding seems to be in place.
If nobody minds, I'll close the pull request, then use this commit to
manually push the files to the ciphershed master. I already did a
--dry-run with it and it worked good, so I think it's just ready to
go.
Other related posts:
