Groups > linux.debian.maint.python > #14071

Re: Messed up a salsa commit - how best to fix?

Path	csiph.com!newsfeed.xs4all.nl!newsfeed8.news.xs4all.nl!bofh.it!news.nic.it!robomod
From	Geert Stappers <stappers@stappers.nl>
Newsgroups	linux.debian.maint.python
Subject	Re: Messed up a salsa commit - how best to fix?
Date	Sun, 24 Apr 2022 22:10:01 +0200
Message-ID	<EfQIp-aWgw-9@gated-at.bofh.it> (permalink)
References	<EfQIp-aWgw-3@gated-at.bofh.it>
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Sun Apr 24 20:09:38 2022
Old-Return-Path	<stappers@stappers.nl>
X-Amavis-Spam-Status	No, score=-7.01 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, T_SCC_BODY_TEXT_LINE=-0.01] autolearn=ham autolearn_force=no
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	NeoMutt/20170113 (1.7.2)
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/19895
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/20220424200921.osbxxksqpumhclci@gpm.stappers.nl
Approved	robomod@news.nic.it
Lines	33
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Sun, 24 Apr 2022 22:09:21 +0200
X-Original-Message-ID	<20220424200921.osbxxksqpumhclci@gpm.stappers.nl>
X-Original-References	<YmWsfgh9aGaHTJ/C@d-and-j.net>
Xref	csiph.com linux.debian.maint.python:14071

Show key headers only | View raw

On Sun, Apr 24, 2022 at 09:01:02PM +0100, Julian Gilbey wrote:
> Hi,
> 
> Somehow I managed to really mess up a commit to python-qtconsole: the
> upstream and pristine-tar branches do not have the upstream/5.3.0
> sources (the current ones).  However, there's already an
> upstream/5.3.0 tag in the repository, pointing to a commit to the
> master branch.
> 
> I think the simplest thing to do is to "rewrite history": delete the
> head commits to the master branch and the 5.3.0 tags, and then
> recommit correctly and force-push to salsa.
> 
> Would people be OK with me doing this,

I'm not OK with rewriting history.


> or do you have an alternative suggestion?

Accept the failure, learn from it, move on, make new mistakes, learn from them.

In other words:  Do not spend energy on erasing a mistake^Wlearing expirience.

 
> Best wishes,
>    Julian
> 

Groeten
Geert Stappers
-- 
Silence is hard to parse

Thread

Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 22:10 +0200
  Re: Messed up a salsa commit - how best to fix? Geert Stappers <stappers@stappers.nl> - 2022-04-24 22:10 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 22:50 +0200
      Re: Messed up a salsa commit - how best to fix? Geert Stappers <stappers@stappers.nl> - 2022-04-25 08:20 +0200
  Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-24 22:50 +0200
    Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-24 23:00 +0200
      Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:20 +0200
      Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:30 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:20 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-26 12:10 +0200
      Re: Messed up a salsa commit - Reporting the fix Geert Stappers <stappers@debian.org> - 2022-04-26 13:30 +0200
        Re: Messed up a salsa commit - Reporting the fix Julian Gilbey <julian@d-and-j.net> - 2022-04-26 14:30 +0200
      Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-26 14:00 +0200
        Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-26 14:40 +0200

csiph-web