Wireshark · Wireshark-dev: Re: [Wireshark-dev] Multiple commits per topic branch

[Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>]

Thanks for this information... (i search this information about "topic branch" this afternoon...)

On Thu, Sep 19, 2013 at 7:38 PM, Marc Petit-Huguenin <marc@xxxxxxxxxxxxxxxxxx> wrote:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

It is possible to have more than one commit per topic branch.  If it is the
case, git push will create one patchset per commit in the Gerrit server, with
a dependency between successive commits.

In most case, this is not a good idea to have multiple commits per branch,
because of the dependencies created: The first commit has to be merged before
the second can be merged, and so on, so if there is no relationship between
your modifications, it is better to create a separate topic branch for each of
them, so they can be reviewed and merged independently (at the cost of
additional rebase).

On the other hand, reviewers generally dislike having to review patchsets that
are too big (the smaller a patchset, the more likely you will find someone to
review it), so splitting a commit is a good idea in those cases.  One specific
case where it is very useful to have two commits in the branch is to not mix
source formatting with code modifications.

As an example of what could be done after a reviewer complains about the size
of a patchset, I split the patchset
http://test.code.wireshark.org/review/#/c/6/ in 2, and pushed again the
branch, creating an additional patchset
http://test.code.wireshark.org/review/#/c/13/.

To make things a little bit easier for reviewers, you can link all the
patchsets together by using a topic.  In that case I used the following
command to push the branch, creating the topic "reload-patchsets":

git push
ssh://<username>@test.code.wireshark.org:29418/wireshark-review-sandbox
HEAD:refs/for/master%topic=reload-patchsets

This way you can click on the topic, and see all the related patchsets.

To prevent name clashing, some sort of naming scheme for the topics should be
created (<username>/<branch name> ?)

- --
Marc Petit-Huguenin
Email: marc@xxxxxxxxxxxxxxxxxx
Blog: http://blog.marc.petit-huguenin.org
Profile: http://www.linkedin.com/in/petithug
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAEBCAAGBQJSOzaUAAoJECnERZXWan7EDNgP+gOS8nkU0Q2FAs8TeGWTA0dI
ngT3uHCTrAnt8795xEYOO1QeGDWFY4XKLe5Y4MMM+rK3ccrpe0j0BGnSFv1Uy+3e
XdMVnTtddYAzJZjYueMSRzg7ncg/9HCbGNXn9dJ4SsR7qFaNtBonkMdBPypttO/p
Cgc53EGrnFFc47M8QFUNakr15XBwG9WBnlQCw8IUNfWAoXM59qvLqV0neazWJ5JY
MBzRpAEvMjcyYRcQK8FXvJJFBWko6IYqfvtXFHneEUQTYeVRvPnrPDpwfZkyl/6E
KNZ/UjhEXn+eQds/pz+7cxEaP/p7HGpwwsnNDahiFS/BSFWgBoJX14hdJ6baLE89
qhYsQ5mUy49d4Umb7bNxBzLtWHXjVjip9Gb8+/Zm+86mGVbRQx9zJZzfX9w5Yrzd
hrv8Vqygb0Uy6+O5Z9eyNXajZwlgun7Hh/1VaBKxgwegsuJq/z2h1qI7HuJOHasJ
qzmR9fPqQUyUq5aFMtWRq6nc8M7xGa5dzPuihP0qVX3EoVlWiyQUd5WU+8jH888k
mQHBdI12JNj6UdigIebN3ubKpDlF42sySP2HJO02c1F71C9DparIEHA4oUM3zr99
JKQQUchsXKMsgiWr5YKEIsKEqhPZ2rM7HIT8mWxTvNqLgn1QJTaOK+tYyiIvb0Gr
pJZ0+4oSDObTHr7c2q3/
=MXcJ
-----END PGP SIGNATURE-----
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe