all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Python Team: Keeping Branch Up To Date Question
@ 2023-09-05  2:13 jgart
  2023-09-08  7:33 ` Lars-Dominik Braun
  0 siblings, 1 reply; 6+ messages in thread
From: jgart @ 2023-09-05  2:13 UTC (permalink / raw)
  To: guix-devel; +Cc: Lars-Dominik Braun

Hi Lars,

What is the git approach for keeping the Python branch up to date? 🦆

Should I be rebasing off of master or something else?

I'm trying to review this patch:

https://issues.guix.gnu.org/64973

Any advice much appreciated.

all best,

jgart


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Python Team: Keeping Branch Up To Date Question
  2023-09-05  2:13 Python Team: Keeping Branch Up To Date Question jgart
@ 2023-09-08  7:33 ` Lars-Dominik Braun
  2023-09-09 12:58   ` Maxim Cournoyer
  2023-09-09 17:40   ` jgart
  0 siblings, 2 replies; 6+ messages in thread
From: Lars-Dominik Braun @ 2023-09-08  7:33 UTC (permalink / raw)
  To: jgart; +Cc: guix-devel

Hi,

> What is the git approach for keeping the Python branch up to date? 🦆
> Should I be rebasing off of master or something else?

yeah, that’s generally what I would do before working on it. Note that
you cannot force-push into Savannah. You have to remove the remote branch
and create it again.

Lars



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Python Team: Keeping Branch Up To Date Question
  2023-09-08  7:33 ` Lars-Dominik Braun
@ 2023-09-09 12:58   ` Maxim Cournoyer
  2023-09-09 17:40   ` jgart
  1 sibling, 0 replies; 6+ messages in thread
From: Maxim Cournoyer @ 2023-09-09 12:58 UTC (permalink / raw)
  To: Lars-Dominik Braun; +Cc: jgart, guix-devel

Hi,

Lars-Dominik Braun <lars@6xq.net> writes:

> Hi,
>
>> What is the git approach for keeping the Python branch up to date? 🦆
>> Should I be rebasing off of master or something else?
>
> yeah, that’s generally what I would do before working on it. Note that
> you cannot force-push into Savannah. You have to remove the remote branch
> and create it again.

I'd like to add that unless you are the only person pushing on a branch,
delete and recreate with a rewritten history is not a good idea (it'll
force every other contributors to notice and 'git fetch && git reset
--hard your-team-branch', which is impolite).

When multiple people are actively contributing to the same branches, the
branch history already published shouldn't be rewritten -- which means
master should be merged into the team branch rather than the team branch
rebased on master.

-- 
Thanks,
Maxim


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Python Team: Keeping Branch Up To Date Question
  2023-09-08  7:33 ` Lars-Dominik Braun
  2023-09-09 12:58   ` Maxim Cournoyer
@ 2023-09-09 17:40   ` jgart
  2023-09-09 22:08     ` Maxim Cournoyer
  2023-09-10  1:30     ` jgart
  1 sibling, 2 replies; 6+ messages in thread
From: jgart @ 2023-09-09 17:40 UTC (permalink / raw)
  To: Maxim Cournoyer, Lars-Dominik Braun; +Cc: guix-devel

Thanks, I ended up doing what you suggested.

Should we document this git branch policy for contributors with commit access in the manual?

I think we should state it explicitly so there is no confusion for new contributors with commit access.

all best,

jgart


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Python Team: Keeping Branch Up To Date Question
  2023-09-09 17:40   ` jgart
@ 2023-09-09 22:08     ` Maxim Cournoyer
  2023-09-10  1:30     ` jgart
  1 sibling, 0 replies; 6+ messages in thread
From: Maxim Cournoyer @ 2023-09-09 22:08 UTC (permalink / raw)
  To: jgart; +Cc: Lars-Dominik Braun, guix-devel

Hi jgart,

"jgart" <jgart@dismail.de> writes:

> Thanks, I ended up doing what you suggested.
>
> Should we document this git branch policy for contributors with commit access in the manual?
>
> I think we should state it explicitly so there is no confusion for new contributors with commit access.

If documented, I think it should go to the teams section, as feature
branches will be managed by team members rather than a recent
contributor, I think.

-- 
Thanks,
Maxim


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Python Team: Keeping Branch Up To Date Question
  2023-09-09 17:40   ` jgart
  2023-09-09 22:08     ` Maxim Cournoyer
@ 2023-09-10  1:30     ` jgart
  1 sibling, 0 replies; 6+ messages in thread
From: jgart @ 2023-09-10  1:30 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: Lars-Dominik Braun, guix-devel

So, I should add a Python teams specific section to the texinfo docs?


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-09-10  1:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-05  2:13 Python Team: Keeping Branch Up To Date Question jgart
2023-09-08  7:33 ` Lars-Dominik Braun
2023-09-09 12:58   ` Maxim Cournoyer
2023-09-09 17:40   ` jgart
2023-09-09 22:08     ` Maxim Cournoyer
2023-09-10  1:30     ` jgart

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.