[Android-tools-devel] Code Review

[Chirayu Desai]

Hi,


On Thu, Jun 30, 2016 at 3:46 PM 殷啟聰 <seamlikok at gmail.com> wrote:

> Hi Chirayu,
>
> It is nice to enable code review for Debian packaging. But there are
> one thing we need to be wary of:
>
> The debian/changelog file is IMO the most likely place to cause a
> merge conflict. If one's changes are going through a code review, we
> can avoid touching debian/changelog and update it after the changes
> are pushed to the master repo.
>

I agree with you here, I had some trouble trying to manage that file when
creating the android-jar branch due to conflicts on every single commit.

Could have a page on the wiki under AndroidTools for some code review
practices to follow for our team / repos in general.

>
> Cheers,
> Kai-Chung Yan
>
> 2016-06-07 20:14 GMT+08:00 Chirayu Desai <chirayudesai1 at gmail.com>:
> > Hello everyone,
> >
> > This topic was recently brought up on IRC (#debian-mobile), and a good
> > easy to setup workflow was suggested by Hans [1].
> > We also discussed using gerrit [2] (what upstream uses), however it's
> > setup and maintenance won't be an easy task, so it seems best to look
> > for an alternative workflow for now.
> >
> > I have went ahead and forked all repos under android-tools on
> > git.debian.org to my personal gitlab account [3]. They follow the
> > naming scheme debian_android-tools_<actual name>
> > I have pushed all branches from git.debian.org under alioth/, and have
> > also pushed the tags as-is.
> > I plan to push any changes I do here, and then ask for a review before
> > it gets pushed to git.debian.org.
> >
> > To sum this up, the workflow can be:
> > developer A pushes to his own fork on github/gitlab/etc
> > developers B, C, & so on have each other's forks as remotes along with
> upstream.
> > another developer (not A) can review the patch and then push it to
> > upstream if it looks good.
> >
> > Alternatively, it can be used for staging / collaboration apart from
> > just code reviews.
> >
> > Regards,
> > Chirayu Desai
> >
> > [1]:
> https://guardianproject.info/2013/11/21/a-tag-team-git-workflow-that-incorporates-auditing/
> > [2]:
> https://gerrit-review.googlesource.com/Documentation/intro-quick.html
> > [3]: https://gitlab.com/dashboard/projects
> >
> > _______________________________________________
> > Android-tools-devel mailing list
> > Android-tools-devel at lists.alioth.debian.org
> >
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/android-tools-devel
>
>
>
> --
> /*
> * 殷啟聰 | Kai-Chung Yan
> * 一生只向真理與妻子低頭
> * Undergraduate student in National Taichung University of Education
> * LinkedIn: <https://linkedin.com/in/seamlik>
> * Blog: <http://seamlik.logdown.com>
> */
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20160701/40b28e5c/attachment.html>