| Re: [hatari-devel] Recent Hatari change problems |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- To: Eero Tamminen <oak@xxxxxxxxxxxxxx>
- Subject: Re: [hatari-devel] Recent Hatari change problems
- From: Thomas Huth <th.huth@xxxxxxxxx>
- Date: Tue, 1 May 2018 07:26:09 +0200
- Cc: hatari-devel@xxxxxxxxxxxxxxxxxxx
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1525152371; bh=GnXJrh1cSV5BzEvnr43LwaQ16i925f4ZMC5zswUzuG4=; h=Date:From:To:Cc:Subject:From; b=l4i1bbH3qt38uUJ3xjdHa8ZAWNNCw+40R7C8T8nHaf8qFXuDf+oN1NZd/i1cyxFwr LONkwwCW/SrSptGACuAOHBHqhQjB3NTP4oQ+rq4jdBKt3XoY5GiKCFa8xdzomFL8+o DN8XJFbZK/KxZhxFKkCxspyGTQel//nfbrCJoOvPN0M8g2fYkjKh3NRvITgp5qexWs BGIS4nIH8M3/vYRV0Mkh38q+UMbVik6Ecn/GsrZOkMVt6GsDNmqnHWt7SV9iQYEpQn 54nGWYdol0UjcJoZ8f736cudzU8tVyBChI2blT81wGIs2OBaUQcAVUmPARtJyk9jNt WcCF9mvnvWEJA==
Am Mon, 30 Apr 2018 23:50:26 +0300
schrieb Eero Tamminen <oak@xxxxxxxxxxxxxx>:
> Hi,
>
> On 04/30/2018 07:17 AM, Thomas Huth wrote:
> > Am Wed, 25 Apr 2018 01:17:59 +0300
> > schrieb Eero Tamminen <oak@xxxxxxxxxxxxxx>:
> >
> >> I also reverted the broken CMake test for bashisms.
> >
> > It would be really nice if you don't push your workaround commits
> > for things where others already pushed a better fix.
>
> I had pushed it upstream day before you did your (better) commit,
> and I cannot rebase things that are already in upstream without
> breaking things for others.
No, you apparently only committed it locally to your hard disk, without
pushing it upstream. Otherwise I would have needed to merge before
pushing my changes (Mercurial does not allow to push to a second branch
without --force, and I certainly did not use --force here).
Thomas