Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 00:32, Gerald Combs wrote: On 10/11/19 3:38 PM, Jano Svitok wrote: - gitlab issues are OK, but bugzilla is much more elaborate (for example allows custom fields and most of all, allows custom states -- gitlab flow and issue states is fixed! custom states have to be simulated using

Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 14:59, Pascal Quantin wrote: Le sam. 12 oct. 2019 à 15:08, João Valverde > a écrit : On 12/10/19 13:33, Peter Wu wrote: On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: On 12/10/19 11:48, Roland Knall

Re: [Wireshark-dev] Migrate to GitLab?

Le sam. 12 oct. 2019 à 15:08, João Valverde < joao.valve...@tecnico.ulisboa.pt> a écrit : > > > On 12/10/19 13:33, Peter Wu wrote: > > On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: > > On 12/10/19 11:48, Roland Knall wrote: > > tl;dr - I am also -2 on merge commits, not entirely

Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 13:33, Peter Wu wrote: On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: On 12/10/19 11:48, Roland Knall wrote: tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently

Re: [Wireshark-dev] Migrate to GitLab?

On Sat, Oct 12, 2019 at 12:33:48PM +0100, João Valverde wrote: > > On 12/10/19 11:48, Roland Knall wrote: > > tl;dr - I am also -2 on merge commits, not entirely sure about ff > > either, they tend to be work, cherry-pick would be preferable. > > > > Long version: > > > > Currently we do have a

Re: [Wireshark-dev] Migrate to GitLab?

On 12/10/19 11:48, Roland Knall wrote: tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently we do have a strategy in place, that is called "Cherry-Pick". Basically it means, that Gerrit

Re: [Wireshark-dev] Migrate to GitLab?

Addendum - my initial tl;dr is misleading - I don't like FF because it is extra work, but I definitely prefer it if cherry-picking (as it is applied now) is not an option with gitlab (never looked that up properly). merge is a -2 in any case Am Sa., 12. Okt. 2019 um 12:48 Uhr schrieb Roland Knall

Re: [Wireshark-dev] Migrate to GitLab?

tl;dr - I am also -2 on merge commits, not entirely sure about ff either, they tend to be work, cherry-pick would be preferable. Long version: Currently we do have a strategy in place, that is called "Cherry-Pick". Basically it means, that Gerrit resolves any branch conflicts (the patch had been

Re: [Wireshark-dev] Migrate to GitLab?

As one who has never used GitLab, I'm uncertain about the changes. To educate me can anyone point to an instance of a merge commit in another project? If I understand them correctly (which might not be true) then I'm a -2 for merge commits. I really do NOT want to see master commit history

Re: [Wireshark-dev] Migrate to GitLab?

On 11/10/19 22:54, Gerald Combs wrote: The reactions to migrating so far have been pretty favorable, so I've started documenting the process at https://gitlab.com/wireshark/gitlab-migration/wikis/home. There are still a lot of things to figure out, but I'm hoping that we can start

Re: [Wireshark-dev] Migrate to GitLab?

On 10/11/19 3:38 PM, Jano Svitok wrote: > > - gitlab issues are OK, but bugzilla is much more elaborate (for example > allows custom fields and most of all, allows custom states -- gitlab flow > and issue states is fixed! custom states have to be simulated using tags). > I am not that familiar

Re: [Wireshark-dev] Migrate to GitLab?

Few notes: - instead of git push origin HEAD:feature-number-1 -f (--force) it's better to use --force-with-lease that avoids forcing if the remote branch changed in the meantime (e.g. it prevents losing someone else's commits) - gitlab issues are OK, but bugzilla is much more elaborate (for

Re: [Wireshark-dev] Migrate to GitLab?

The reactions to migrating so far have been pretty favorable, so I've started documenting the process at https://gitlab.com/wireshark/gitlab-migration/wikis/home. There are still a lot of things to figure out, but I'm hoping that we can start preparation and testing some time in November and

Re: [Wireshark-dev] Migrate to GitLab?

On 07/10/19 23:22, Gerald Combs wrote: About a year ago I posted a question to Ask[1] about migrating our development infrastructure to GitLab. I'd like to raise the question again here on -dev, and if that's the direction we decide to go, start migrating late this year and/or early next

Re: [Wireshark-dev] Migrate to GitLab?

On Tue, Oct 8, 2019 at 10:47 AM Guy Harris wrote: > > git push origin HEAD:feature-number-1 > > And can I then do a "git commit --amend" and another "git push origin > HEAD:feature-number-1" to fix issues found in the review/Petri dish/going > back and looking at what I did process? > You're

Re: [Wireshark-dev] Migrate to GitLab?

Am Di., 8. Okt. 2019 um 10:47 Uhr schrieb Guy Harris : > > And can I then do a "git commit --amend" and another "git push origin > HEAD:feature-number-1" to fix issues found in the review/Petri dish/going > back and looking at what I did process? > > And I'm still on the master branch there, so a

Re: [Wireshark-dev] Migrate to GitLab?

On Oct 8, 2019, at 1:34 AM, Dario Lombardo wrote: > On Tue, Oct 8, 2019, 00:34 Guy Harris wrote: > 1) Can you push (or whatever) a proposed commit to GitLab and then do a git > commit --amend, changing either code or commit message, and then push and > have that amend the commit-on-GitLab,

Re: [Wireshark-dev] Migrate to GitLab?

On Oct 8, 2019, at 1:17 AM, Roland Knall wrote: > 1. If you push to GitLab and do it the right way, you create a merge request, > which allows you to ammend the change as many times as you want, similar to > the method with patchsets in Gerrit. Good. > 2. This will not cause merge commits if

Re: [Wireshark-dev] Migrate to GitLab?

I don't like merge commits and polluted history as well, then that's how I configured my projects on gitlab. Merge commits are disabled, only fast forward merges are allowed. This requires every merge request to be rebased before merging. Moreover I configured successful CI as a requirement for

Re: [Wireshark-dev] Migrate to GitLab?

On Tue, Oct 8, 2019 at 12:34 AM Guy Harris wrote: > 2) Will this cause merge commits, such as the crap that GitHub dumps in there > by default: > > > https://github.com/the-tcpdump-group/libpcap/commit/b43fdf882a3bd71391535362b3bf560ec54e77ef > > to pollute the history? In GitHub

Re: [Wireshark-dev] Migrate to GitLab?

TL;DR - yes - no - somewhat Long version: 1. If you push to GitLab and do it the right way, you create a merge request, which allows you to ammend the change as many times as you want, similar to the method with patchsets in Gerrit. 2. This will not cause merge commits if done properly. 3. Here

Re: [Wireshark-dev] Migrate to GitLab?

On Oct 7, 2019, at 3:22 PM, Gerald Combs wrote: > For new contributors, getting up and running with GitLab should be easier. > GitLab doesn't require pushing to a special remote reference and doesn't > require a special Change ID in the commit message. It should also be more > familiar. For

Re: [Wireshark-dev] Migrate to GitLab?

On Mon, Oct 7, 2019 at 3:22 PM Gerald Combs wrote: > > About a year ago I posted a question to Ask[1] about migrating our > development infrastructure to GitLab. I'd like to raise the question again > here on -dev, and if that's the direction we decide to go, start migrating > late this year

[Wireshark-dev] Migrate to GitLab?

About a year ago I posted a question to Ask[1] about migrating our development infrastructure to GitLab. I'd like to raise the question again here on -dev, and if that's the direction we decide to go, start migrating late this year and/or early next year. GitLab's feature set includes