proposal for git workflow updates

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

proposal for git workflow updates

Tom Henderson-2
I'd like maintainers to please review the following proposed update to
our git workflow documentation:

https://gitlab.com/nsnam/ns-3-dev/merge_requests/97

I also propose to change the merge settings on ns-3-dev.git to default
to fast forward merges.

Background on these two proposals:

We just released ns-3.30 but someone spotted a regression and a fix is
being reviewed (for those interested:
https://gitlab.com/nsnam/ns-3-dev/merge_requests/96).

In my view, this issue warrants making a hotfix release, and I would
like to publish one shortly once the wifi fix is approved.

In the past, using mercurial, we would create separate repositories for
each release.  We are now using git, so we need a new way to manage
releases from within our single git repository.

After some offline discussion with Stefano, I have a proposal on how we
can manage branches and tags to deal with releases.  This doesn't
fundamentally change our workflow (which is based on OneFlow), but adds
detail about how to handle releases.

I wrote the proposal as an extension to our git documentation; hence the
merge request.

While we are on the topic, I would like to change the repository
settings to allow fast forward merges by default, so that simple patches
do not generate merge commits.  I have been avoiding the web UI to
sidestep these commits in my own work, and I think others are doing so
as well.

- Tom






Reply | Threaded
Open this post in threaded view
|

Re: proposal for git workflow updates

Tom Henderson-2
Besides the ns-3.30.1 release, I also made the below documentation and
repository settings changes today.

- Tom


On 8/31/19 5:21 PM, Tom Henderson wrote:

> I'd like maintainers to please review the following proposed update to
> our git workflow documentation:
>
> https://gitlab.com/nsnam/ns-3-dev/merge_requests/97
>
> I also propose to change the merge settings on ns-3-dev.git to default
> to fast forward merges.
>
> Background on these two proposals:
>
> We just released ns-3.30 but someone spotted a regression and a fix is
> being reviewed (for those interested:
> https://gitlab.com/nsnam/ns-3-dev/merge_requests/96).
>
> In my view, this issue warrants making a hotfix release, and I would
> like to publish one shortly once the wifi fix is approved.
>
> In the past, using mercurial, we would create separate repositories
> for each release.  We are now using git, so we need a new way to
> manage releases from within our single git repository.
>
> After some offline discussion with Stefano, I have a proposal on how
> we can manage branches and tags to deal with releases.  This doesn't
> fundamentally change our workflow (which is based on OneFlow), but
> adds detail about how to handle releases.
>
> I wrote the proposal as an extension to our git documentation; hence
> the merge request.
>
> While we are on the topic, I would like to change the repository
> settings to allow fast forward merges by default, so that simple
> patches do not generate merge commits.  I have been avoiding the web
> UI to sidestep these commits in my own work, and I think others are
> doing so as well.
>
> - Tom
>
>
>
>
>
>