[Graham Bloice <graham.bloice@xxxxxxxxxxxxx>]

On 11 March 2014 17:59, Evan Huus <eapache@xxxxxxxxx> wrote:

On Tue, Mar 11, 2014 at 1:18 PM, Christopher Maynard
<Christopher.Maynard@xxxxxxxxx> wrote:
> Graham Bloice <graham.bloice@...> writes:
>
>> On 11 March 2014 16:41, Anders Broman
> <anders.broman@xxxxxxxxxxxx> wrote:
>>
>>
>> -----Original Message-----
>> From: wireshark-dev-bounces@xxxxxxxxxxxxx
> [mailto:wireshark-dev-bounces@xxxxxxxxxxxxx] On
> Behalf Of Evan Huus
>>
>> Sent: den 11 mars 2014 17:26
>> To: Developer support list for Wireshark
>> Subject: Re: [Wireshark-dev] Fix bug in GSM MAP, have problems with GIT
>>
>> On Tue, Mar 11, 2014 at 12:05 PM, Christopher Maynard <Christopher.Maynard
> <at> gtech.com> wrote:
>> >> Evan Huus <eapache <at> ...> writes:
>> >>
>> >> I've been particularly busy of late, so I haven't had any real time to
>> >> look into git or gerrit yet, and I'm probably not going to have any
>> >> time to do so for a few more weeks at least.  There are probably
>> >> around 200 posts to wireshark-dev about git and gerrit, many with
>> >> tidbits of helpful information, but nothing really consolidated.
>> >>
>> >> Being a complete git+gerrit newb, I also would really appreciate a
>> >> wiki page with consolidated information for all of the common work
>> >> flows that a normal developer as well as a core developer might use.
>> >> I assume http://wiki.wireshark.org/Development/Workflow would be the
>> >> place for it, and when I finally get going, that's where I hope to start.
>> >
>> >I've left that as a kind of overview-discussion of the git migration, and
> added
>> >
>> >http://wiki.wireshark.org/Development/SubmittingPatches
>> >
>> >as a very bare-bones tutorial. Hopefully others will expand it as necessary.
>
> If possible, add some information/basic steps on a few more topics as well?
>  For example:
> 1) How do you undo a commit, or undo part of a commit?
> 2) How do you apply someone else's patch for testing before committing?
> 3) How to backport to other trunks?
> 4) How do you know if someone has a fix or not?  With subversion, they'd
> indicate they're running svn r51234, for example, and then you could tell
> them that they need to update to at least r52345.  With git, how does this
> work with hashes?

I've tried to answer a few of these with a new revision of the page.

>> If someone could add how to do it on Windows that would be good to
>>
>>
>> I shall try this evening.
>
> Thanks.  I too develop on Windows primarily.

It should be nearly identical - git and git-review are both fully
cross-platform AFAIK.

Initial stab at this is up now: http://wiki.wireshark.org/Development/SubmittingPatches/GitForWindows 

This is based purely on what I did to get up and running, not quite finished yet, and it is very PowerShell oriented (because that is the one true way forward!).  Feel free to hack it about.