Hi,
On Tue, Mar 03, 2015 at 12:17:50AM +0500, Andrey Rahmatullin wrote:
> On Mon, Mar 02, 2015 at 07:57:26PM +0100, Andreas Tille wrote:
> >
> > I havn't experienced anything similar before.
> Your master branch contains changes in upstream files (commit
> 35b6b76c8a48c9e8702763abee5fef92c9dbc718), those changes conflict with the
> changes in the new upstream version.
>
> $ git diff --stat a12e4b2e47b945db9e3dbfefc078de8837d32129 master
> debian/changelog | 6 ++++
> debian/control | 5 ---
> ...
> setup.py | 2 +-
> 17 files changed, 300 insertions(+), 217 deletions(-)
That's really weird. Thanks for opening my eyes
Andreas.
--
http://fam-tille.de
--
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20150302211827.gb13...@an3as.eu
