Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-02-01 Thread Evan Huus
On Fri, Jan 31, 2014 at 7:10 PM, Evan Huus wrote: > On Fri, Jan 31, 2014 at 2:22 PM, Guy Harris wrote: >> >> On Jan 31, 2014, at 10:26 AM, Evan Huus wrote: >> >>> On Fri, Jan 31, 2014 at 12:44 PM, Guy Harris wrote: On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: > But one c

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Evan Huus
On Fri, Jan 31, 2014 at 2:22 PM, Guy Harris wrote: > > On Jan 31, 2014, at 10:26 AM, Evan Huus wrote: > >> On Fri, Jan 31, 2014 at 12:44 PM, Guy Harris wrote: >>> >>> On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: >>> But one clarification. You do not check-out a project with git. This >

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Evan Huus
On Fri, Jan 31, 2014 at 6:20 PM, Evan Huus wrote: > On Fri, Jan 31, 2014 at 4:01 PM, Graham Bloice > wrote: >>> >>> I use git-review which adds a "git review" command that does the right >>> thing with respect to gerrit. >>> https://github.com/openstack-infra/git-review >>> >> >> I was looking in

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Evan Huus
On Fri, Jan 31, 2014 at 4:01 PM, Graham Bloice wrote: >> >> I use git-review which adds a "git review" command that does the right >> thing with respect to gerrit. >> https://github.com/openstack-infra/git-review >> > > I was looking into git-review and it appears things work automagically if > th

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Graham Bloice
> > > I use git-review which adds a "git review" command that does the right > thing with respect to gerrit. > https://github.com/openstack-infra/git-review > > I was looking into git-review and it appears things work automagically if the repository has .gitreview file. Can someone who knows what

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Evan Huus
On Fri, Jan 31, 2014 at 2:22 PM, Guy Harris wrote: > > On Jan 31, 2014, at 10:26 AM, Evan Huus wrote: > >> On Fri, Jan 31, 2014 at 12:44 PM, Guy Harris wrote: >>> >>> On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: >>> But one clarification. You do not check-out a project with git. This >

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Guy Harris
On Jan 31, 2014, at 10:26 AM, Evan Huus wrote: > On Fri, Jan 31, 2014 at 12:44 PM, Guy Harris wrote: >> >> On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: >> >>> But one clarification. You do not check-out a project with git. This >>> is a misconception. You clone the complete repository of

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Evan Huus
On Fri, Jan 31, 2014 at 12:44 PM, Guy Harris wrote: > > On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: > >> But one clarification. You do not check-out a project with git. This >> is a misconception. You clone the complete repository of wireshark >> into a local copy. > > Unfortunately, yes, th

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Guy Harris
On Jan 31, 2014, at 2:22 AM, Roland Knall wrote: > But one clarification. You do not check-out a project with git. This > is a misconception. You clone the complete repository of wireshark > into a local copy. Unfortunately, yes, that's what happens, imposing a requirement to push changes afte

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Roland Knall
Btw, take a look at https://wiki.openstack.org/wiki/GitCommitMessages to see more clear what I mean with commiting changes separately. They have a very good discussion about what differs good commits from bad ones, not necessarily applying to only git. regards, Roland On Fri, Jan 31, 2014 at 11:2

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Roland Knall
On Fri, Jan 31, 2014 at 10:40 AM, Guy Harris wrote: > ...and I use multiple sheets of paper for multiple ideas. > > I.e., it sounded as if you were talking about using a *single* checked-out > tree for *multiple independent* projects, which I would no more do than would > I use a single window f

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Guy Harris
On Jan 31, 2014, at 12:58 AM, Roland Knall wrote: > Branches are more of sheets of paper, you add to a folder > or remove, depending on your progress and ideas. ...and I use multiple sheets of paper for multiple ideas. I.e., it sounded as if you were talking about using a *single* checked-out

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Roland Knall
On Fri, Jan 31, 2014 at 9:23 AM, Guy Harris wrote: > Actually, if I'm working on various parts of the source at the same time, > because I have more than one project in progress, I have multiple separate > trees, so there's nothing to switch. (There are, I guess, people out there > who actuall

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Guy Harris
On Jan 31, 2014, at 12:17 AM, Roland Knall wrote: > You can also take a look at > http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions I did, and saw a comment that said: Unfortunately, the new Pragmstic Programming book is mostly written from using Git

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Guy Harris
On Jan 31, 2014, at 12:17 AM, Roland Knall wrote: > 2. You may work on various parts of the source at the same time, e.g. > changing an interface for the UI and therefore adding changes to gtk, > qt and tshark at the same time. For this you add a branch for the > underlying change, and each indi

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-31 Thread Roland Knall
Hi There are a couple of reasons why you should not work on master, and they nearly all come back to the argument: "rebase is nearly allways preferable over merge" 1. You are doing local reviews of patches. Those can be done in separate sub-branches and reside there, no matter if you pull up mast

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-30 Thread Michal Labedzki
On 30 January 2014 21:08, Guy Harris wrote: > > On Sep 18, 2013, at 5:52 PM, Marc Petit-Huguenin > wrote: > >> One of the essential rule is that you *never*, *ever* work in the master >> branch. > > Why not? I agree with this question. "master" is local branch and "origin/master" is all time a

Re: [Wireshark-dev] Quick start instructions for Gerrit

2014-01-30 Thread Guy Harris
On Sep 18, 2013, at 5:52 PM, Marc Petit-Huguenin wrote: > One of the essential rule is that you *never*, *ever* work in the master > branch. Why not? > This branch must be considered read-only. So to create a patchset, you need > first to create a topic branch. ... > Obviously som

Re: [Wireshark-dev] Quick start instructions for Gerrit

2013-09-19 Thread Alexis La Goutte
Thanks for the How To :-) On Thu, Sep 19, 2013 at 2:52 AM, Marc Petit-Huguenin < m...@petit-huguenin.org> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Thess quick start instructions assume that you know about git, that you > already have an ssh key pair configured and that ss

Re: [Wireshark-dev] Quick start instructions for Gerrit

2013-09-19 Thread Marc Petit-Huguenin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 09/19/2013 07:02 AM, Evan Huus wrote: > Thanks for the information, it is very useful. I am a bit confused though. > Am I understanding correctly that every open review must be rebased after > one is landed in master? This is order of n^2 rebases

Re: [Wireshark-dev] Quick start instructions for Gerrit

2013-09-19 Thread Evan Huus
Thanks for the information, it is very useful. I am a bit confused though. Am I understanding correctly that every open review must be rebased after one is landed in master? This is order of n^2 rebases to land n revisions, which really doesn't scale. What am I missing? Thanks, Evan On 2013-09

[Wireshark-dev] Quick start instructions for Gerrit

2013-09-18 Thread Marc Petit-Huguenin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Thess quick start instructions assume that you know about git, that you already have an ssh key pair configured and that ssh and git are installed on your computer. Note that the email configured in git must match the email that you used in the Gerr