Re: [freenet-dev] Github and code review

[Roland Haeder]

On Sun, 22 Mar 2015 22:27:24 +
Matthew Toseland mj...@cam.ac.uk wrote:

 Your code should not be rejected because it is on master on your own
 repository IMHO. However, if you are going to make multiple pull
 requests you really need to use separate branches. If you have several
 different changes on the same branch then you definitely need to
 separate them out before making a pull request.
 
 However, this is pretty easy using git branch, git reset and git
 cherry-pick.
 

Okay, I will try it then later. Thank you. :-)


signature.asc
Description: PGP signature
___
Devl mailing list
Devl@freenetproject.org
https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl

Re: [freenet-dev] Github and code review

[Roland Haeder]

On Sun, 22 Mar 2015 21:40:41 +
Matthew Toseland mj...@cam.ac.uk wrote:

 On 22/03/15 19:22, Ian Clarke wrote:
 Unfortunately, sometimes it is necessary to make big changes.

One good example is the initial import of all files for a new project.
There you commit a huge chunk of files and directories.

As I'm (different project) a newcomer to a project's development, I
had started cloning the original repository (creating a personal
clone) and started developing. I did this by committing carefully and
I tried to avoid huge changes (not always possible, more below) to let
them easily review them.

Then I stepped towards them and my commits got rejected because I
didn't make a feature branch or fix branch ... :-( That is kind of
frustrating because my commits won't make it in.

What I mean here is that the maintainer should not be so bureaucratic
to newcomers as this could turn them away and they may never come back.

The maintainer can then still review commits relatively easily by
setting up a merge branch

git checkout master # or wherever your development branch is
git remote add rolands_code git://git.bla.example/some/foo.git --track
master
git checkout -b code_reviewed_okay/master
git checkout master
git checkout -b rolands_master
git pull rolands_code

This way you can check your code with changes from developer
roland (yes, my name) without mixing it so quickly with your own
code. Then start the review process by looking at each commit and
cherry-pick it into code_reviewed_okay/master branch:

git checkout code_reviewed_okay/master
git cherry-pick xx
git checkout rolands_master

Then you can check them again (on functionality) in the review branch
(as not all commits from rolands_master are in) and continue with next
one.

Maybe there is a better way. :-) But this way may work. After that
merge all reviewed commits into master:

git checkout master
git merge -S code_reviewed_okay/master

That seems to be a fine way to me.

My 2 cents. :-)


signature.asc
Description: PGP signature
___
Devl mailing list
Devl@freenetproject.org
https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl

Re: [freenet-dev] How the NSA attacks Tor

[Roland Haeder]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

It is ...

ISBEKAC? ;-)

InSecurity BEtween Keyboard And Chair

Roland

On 10/05/2013 08:47 PM, Ian Clarke wrote:
 This doesn't have anything to do with the Silk Road takedown, if
 that is what you are referring to.
 
 The vulnerability there was between keyboard and chair.
 
 Ian.

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAlJQmDcACgkQty+BhcbHvXj6vACdHs9EFGEqu2E0ZpK+O+joCFlo
68kAoKS/m9JlCx3bhiZ+VcIBlg/HBzAR
=xRsd
-END PGP SIGNATURE-
___
Devl mailing list
Devl@freenetproject.org
https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl

Re: [freenet-dev] Freenet 0.7.5 build 1422

[Roland Haeder]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

sorry, but I got this:
http://pastie.org/5139800

(Yes, I'm back after some time. :) )

Regards,
Roland

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlCQT8EACgkQty+BhcbHvXhOfQCcCiPhmvu2KbJ2prhOj/WJRokc
7GoAnih/9ovy5AKLEQu0RwEfBQzEfPKL
=xMia
-END PGP SIGNATURE-
___
Devl mailing list
Devl@freenetproject.org
https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl

Re: [freenet-dev] [freenet-support] Freenet 0.7.5 build 1314 (and 1313)

[Roland Haeder]

Hi,

I still have an exception here. It happens right after I entered my
password:
http://www.mxchange.org/downloads/freenet/array-index-out-of-bounds.txt

After this I accessed http://127.0.0.1:/downloads/ but I still got a
NPE:
http://www.mxchange.org/downloads/freenet/npe1.txt

Roland


signature.asc
Description: This is a digitally signed message part
___
Devl mailing list
Devl@freenetproject.org
http://freenetproject.org/cgi-bin/mailman/listinfo/devl

[freenet-dev] [freenet-support] Freenet 0.7.5 build 1314 (and 1313)

[Roland Haeder]

Hi,

I still have an exception here. It happens right after I entered my
password:
http://www.mxchange.org/downloads/freenet/array-index-out-of-bounds.txt

After this I accessed http://127.0.0.1:/downloads/ but I still got a
NPE:
http://www.mxchange.org/downloads/freenet/npe1.txt

Roland
-- next part --
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: