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

RE:Packaging python-xrayutilities

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr>
Newsgroups	linux.debian.maint.python
Subject	RE:Packaging python-xrayutilities
Date	Mon, 18 Mar 2019 16:50:01 +0100
Message-ID	<xD2Gt-3gl-1@gated-at.bofh.it> (permalink)
References	<xCWUp-8b8-15@gated-at.bofh.it> <xCXns-9M-21@gated-at.bofh.it> <xD2Gt-3gl-3@gated-at.bofh.it> <xD2n7-39O-7@gated-at.bofh.it>
X-Mailbox-Line	From debian-python-request@lists.debian.org Mon Mar 18 15:41:55 2019
Old-Return-Path	<alexandre.marie@synchrotron-soleil.fr>
X-Amavis-Spam-Status	No, score=-5.2 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LDO_WHITELIST=-5, THREADTOPIC=2] autolearn=no autolearn_force=no
X-Policyd-Weight	using cached result; rate: -4.6
Dkim-Filter	OpenDKIM Filter v2.11.0 brouette.synchrotron-soleil.fr 63CF37000A6
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=synchrotron-soleil.fr; s=email; t=1552923701; bh=aOTYPEwQAxRTxVf+fmuuVi5zVE0AI9Fn4Hb7QSgwKX0=; h=From:To:Subject:Date:References:In-Reply-To:From; b=EHPaVH0kBIg51Y9MrPUDKJmjjX+ThJGwrxxqR0d2NNR+d4RP9FXzSpwNhxjXbdX8j Jxa9uN2kKp7kDbbd00ZqV3VF7zvq/PSG9DEtkoXB0IDAsx6PTgUVTWQvsESxLU+xWT d9cvjvI8jWuJY+l4pTlLexsuChi27gslFcEEiCzs=
Dkim-Filter	OpenDKIM Filter v2.11.0 brouette.synchrotron-soleil.fr B4CA6700078
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=synchrotron-soleil.fr; s=email; t=1552923700; bh=aOTYPEwQAxRTxVf+fmuuVi5zVE0AI9Fn4Hb7QSgwKX0=; h=From:To:Subject:Date:References:In-Reply-To:From; b=Nxzcn9jTMb+2Y8RbmA48EcF7ailGTDKyhOKKDyphiJEj9oYdicfnH8/C1Ix1yj2pv TST7MvOtXVz3L725hWmL4PDLfhDdifVXSqzKauuEc0VwvgtZIC5lYMG+qImUD+l7xE SgyteBxgladIp2Mmc4NpSfFCG+6NWEM6RS0HFFJM=
Thread-Topic	Packaging python-xrayutilities
Thread-Index	AdTdbg8sMxhRl7roRP2zSfL6uDxPxv//8OeAgABthEf///GTAIAAFI0H
Accept-Language	fr-FR, en-US
Content-Language	fr-FR
X-Originating-IP	[195.221.0.171]
Content-Type	text/plain; charset="us-ascii"
Content-Transfer-Encoding	quoted-printable
MIME-Version	1.0
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/16845
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/7EF15309FAA2EA4FAB1643CB55D93ED8DBC56F@SUN-DAG3.synchrotron-soleil.fr
Approved	robomod@news.nic.it
Lines	18
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Mon, 18 Mar 2019 15:41:39 +0000
X-Original-Message-ID	<7EF15309FAA2EA4FAB1643CB55D93ED8DBC56F@SUN-DAG3.synchrotron-soleil.fr>
X-Original-References	<7EF15309FAA2EA4FAB1643CB55D93ED8DBC338@SUN-DAG3.synchrotron-soleil.fr> <fbbfeb0c-fcd4-157e-84fd-ffba0124bcdc@craneworks.de> <7EF15309FAA2EA4FAB1643CB55D93ED8DBC548@SUN-DAG3.synchrotron-soleil.fr>,<20190318152246.GB1440@belkar.wrar.name> <20190318152246.GB1440@belkar.wrar.name>
Xref	csiph.com linux.debian.maint.python:11384

Show key headers only | View raw

>  You need to find why there are conflicts and fix them. Good first steps
>  are running gbp with --no-rollback and/or finding what upstream files are
>  modified in the master branch in the current state.

When I do so, I only have one conflict on the file .gitignore.
I solved it and tried to commit all the staged changes in git gui, I get this message :

```commit-tree failed: fatal: 5d93...... is not a valid 'commit object'```

This error prevents me from doing anything more.

Thanks in advance for response.

Cheers,

Alex

Thread

Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 10:40 +0100
  Re: Packaging python-xrayutilities Florian Pelgrim <fp@craneworks.de> - 2019-03-18 11:10 +0100
    RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 16:30 +0100
      Re: Packaging python-xrayutilities Andrey Rahmatullin <wrar@debian.org> - 2019-03-18 16:30 +0100
        RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 16:50 +0100
          RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-19 14:10 +0100
            RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 11:10 +0100
              Re: Packaging python-xrayutilities Andrey Rahmatullin <wrar@debian.org> - 2019-03-21 11:30 +0100
                Re: Packaging python-xrayutilities Andreas Tille <andreas@an3as.eu> - 2019-03-21 11:50 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 12:00 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 11:50 +0100
                Re: Packaging python-xrayutilities Alex Mestiashvili <amestia@rsh2.donotuse.de> - 2019-03-21 12:10 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 12:20 +0100
              Re: Packaging python-xrayutilities Dmitry Shachnev <mitya57@debian.org> - 2019-03-21 12:40 +0100
                Re: Packaging python-xrayutilities Dmitry Shachnev <mitya57@debian.org> - 2019-03-21 12:50 +0100

csiph-web