13:05:01 <evilaliv3> #startmeeting 13:05:01 <MeetBot> Meeting started Mon May 4 13:05:01 2015 UTC. The chair is evilaliv3. Information about MeetBot at http://wiki.debian.org/MeetBot. 13:05:01 <MeetBot> Useful Commands: #action #agreed #help #info #idea #link #topic. 13:05:08 <evilaliv3> halo! 13:05:17 <elv> halo! 13:05:26 <evilaliv3> sorry to be late elv 13:05:31 <elv> no prob lol :p 13:05:33 <evilaliv3> here is the link for today 13:05:36 <evilaliv3> http://piratepad.net/olHq2nGAGy 13:05:41 <elv> let's switch to the new brand? 13:05:59 <elv> /d/ch/ 13:06:13 <evilaliv3> hope you will enjoy the work done till now 13:06:43 <evilaliv3> yep you can start using it. i've still to fix some issues but i will take care of doing them ongoing 13:06:52 <evilaliv3> i've only one raccomendation 13:07:33 <evilaliv3> when you will commit now, please try to follow the conventional commit message format that as repeated vaious time is the following: 13:08:53 <evilaliv3> wait, i'm tring also to find a reference to use 13:08:58 <evilaliv3> and i'm going to document it on the wiki 13:09:16 <elv> we have to define the integration workflow 13:11:31 <evilaliv3> https://git.kernel.org/cgit/git/git.git/tree/Documentation/SubmittingPatches?id=HEAD 13:11:54 <evilaliv3> ok this is the general reference for what i was saying 13:12:05 <evilaliv3> you do not have to read it now 13:12:10 <evilaliv3> i'm interested only in this 13:13:28 <evilaliv3> The body should provide a meaningful commit message, which: 13:13:29 <evilaliv3> . explains the problem the change tries to solve, iow, what is wrong 13:13:29 <evilaliv3> with the current code without the change. 13:13:29 <evilaliv3> . justifies the way the change solves the problem, iow, why the 13:13:29 <evilaliv3> result with the change is better. 13:13:31 <evilaliv3> . alternate solutions considered but discarded, if any. 13:13:34 <evilaliv3> Describe your changes in imperative mood, e.g. "make xyzzy do frotz" 13:13:36 <evilaliv3> instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy 13:13:39 <evilaliv3> to do frotz", as if you are giving orders to the codebase to change 13:13:42 <evilaliv3> its behaviour. Try to make sure your explanation can be understood 13:13:43 <evilaliv3> without external resources. Instead of giving a URL to a mailing list 13:13:46 <evilaliv3> archive, summarize the relevant points of the discussion. 13:14:07 <evilaliv3> and in general (someone removed it from latest version of this document): 13:14:19 <evilaliv3> uses the imperative, present tense: "change", not "changed" or "changes". 13:15:06 <evilaliv3> this should be like: 13:15:33 <evilaliv3> "Verb (capitalized and in present thans form) ....... " 13:15:36 <evilaliv3> e.g.: 13:15:53 <evilaliv3> Bump to version 2.60.69 13:15:58 <evilaliv3> Update translations 13:16:07 <evilaliv3> Apply RTL fix to .pull-left/.pull-right and few custom classes 13:16:14 <evilaliv3> Fix language change due to javascript race condition 13:16:23 <evilaliv3> Apply cleanup and documentation of debian postinst 13:16:28 <evilaliv3> Fix issue #1256 13:16:56 <evilaliv3> this are the last one of mine, do you recognize the pattern ? 13:19:23 <evilaliv3> e.https://github.com/twisted/twisted/commits 13:19:29 <evilaliv3> e.g. https://github.com/twisted/twisted/commits 13:19:52 <evilaliv3> you can see that quite all the commit from the community of Twisted are in this form 13:20:05 <elv> well, okay, I see, I also need: 13:20:18 <elv> 1) workflow to push things 13:20:37 <evilaliv3> for what concern the workflow i'm working on this and evaluating the use of gitflow 13:21:06 <evilaliv3> in general for now you can try following this commands: 13:21:07 <elv> 2) at least the git commands to begin using the new branch 13:21:21 <evilaliv3> yep, i'm giving you the 2 13:21:28 <evilaliv3> so that you can do a test for you 13:21:34 <elv> ok thanks 13:21:42 <evilaliv3> and see if it automagically work as i would like to 13:21:49 <evilaliv3> git clone repository 13:21:53 <evilaliv3> to clone 13:22:00 <evilaliv3> as starting point 13:23:16 <evilaliv3> git clone git@github.com:origliante/GlobaLeaks.git 13:23:55 <evilaliv3> git remote add upstream git@github.com:globaleaks/GlobaLeaks.git 13:24:51 <evilaliv3> (i'm slow cause i'm retesting them all befor going on) 13:25:22 <evilaliv3> git fetch upstream 13:26:09 <evilaliv3> now that you do not have branch end2end: 13:26:14 <evilaliv3> git checkout end2end 13:26:26 <evilaliv3> then you will work for a few on your patches 13:26:37 <evilaliv3> at one time you will commit on your branch with: 13:26:52 <evilaliv3> git commit -a -m "Implement bla bla bla #1240" 13:27:15 <evilaliv3> at one time you will have the need to fetch changes and rebase your branch 13:27:35 <evilaliv3> git pull --rebase upstrea/end2end 13:28:51 <evilaliv3> then you will have to eventually fix conflicts 13:28:51 <evilaliv3> that means editing a file: e.g. vi file.py 13:29:25 <evilaliv3> and then saying to git you have fixed the conflic for that file: e.g. git add file.py 13:29:50 <evilaliv3> after you have fixed the conflict for each file: git rebase --continue 13:30:56 <evilaliv3> for every call got git pull --rabase / git rebase --continue git will apply your code patch after patch, and you will have to fix conflict by conflict 13:31:07 <evilaliv3> and finally the last git rebase --continue will say: "Ok, we are done!" 13:31:36 <evilaliv3> at thet time you will be able to push all on your repository that will be clean 13:31:46 <evilaliv3> git push origin end2end 13:31:49 <evilaliv3> :) 13:31:55 <evilaliv3> that's all folk 13:32:04 <evilaliv3> this are the only one commands you have to use 13:32:22 <evilaliv3> no git merge or other 13:32:39 <evilaliv3> instead of git pull --rebase you can do things in two steps: 13:32:55 <evilaliv3> first step) git fetch upstream 13:33:15 <evilaliv3> second step) git rebase upstream/end2end 13:33:36 <evilaliv3> but for now i will help you doing always all as described above 13:35:01 <evilaliv3> so that i will be always present when you will have the need to do this things 13:40:33 <elv> okay i'll follow this today 13:49:45 <elv> There's a missing point 13:50:02 <elv> if I follow what you did I would work on upstream/end2end 13:50:03 <evilaliv3> ? 13:50:16 <elv> and not on origin/end2end 13:50:32 <evilaliv3> that's wrong 13:51:03 <evilaliv3> you will work on a local branch called "end2end", and that will start from upstream/end2end 13:51:22 <evilaliv3> then when you will push you will be able to push only on your that is origin/end2end 13:51:31 <evilaliv3> with git push origin end2end 13:51:55 <evilaliv3> but when you work on your pc you have only a a branch called end2end 13:52:00 <evilaliv3> do you get the point? 14:44:23 <evilaliv3> #endmeeting