Hi, 2012/7/15 Alessio Treglia <ales...@debian.org>: > On Sun, Jul 15, 2012 at 8:28 AM, Fabrice Coutadeur <coutade...@gmail.com> > wrote: >> What can I do? > > rm -r ffdiaporama && gbp-clone --pristine-tar ffdiaporama
Actually, this is what I did 4 times, and this is why I decided to check the upstream tag, and came to the conclusion that there is something wrong with it in the ffdiporama repo... Here is the full commands sessions: fabrice@fabrice-VirtualBox:/tmp$ sudo rm -r ffdiaporama [sudo] password for fabrice: fabrice@fabrice-VirtualBox:/tmp$ gbp-clone --pristine-tar git://git.debian.org/pkg-multimedia/ffdiaporama.git Cloning into 'ffdiaporama'... remote: Counting objects: 925, done. remote: Compressing objects: 100% (602/602), done. remote: Total 925 (delta 305), reused 919 (delta 302) Receiving objects: 100% (925/925), 14.40 MiB | 750 KiB/s, done. Resolving deltas: 100% (305/305), done. Branch upstream set up to track remote branch upstream from origin. Branch pristine-tar set up to track remote branch pristine-tar from origin. fabrice@fabrice-VirtualBox:/tmp$ cd ffdiaporama fabrice@fabrice-VirtualBox:/tmp/ffdiaporama$ git-import-orig ../ffdiaporama_1.3.1.orig.tar.gz What is the upstream version? [1.3.1] gbp:info: Importing '../ffdiaporama_1.3.1.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is ffdiaporama gbp:info: Upstream version is 1.3.1 pristine-tar: committed ffdiaporama_1.3.1.orig.tar.gz.delta to branch pristine-tar gbp:info: Merging to 'master' CONFLICT (modify/delete): src/ffDiaporamaStart/Makefile.Release deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporamaStart/Makefile.Release left in tree. CONFLICT (modify/delete): src/ffDiaporamaStart/Makefile.Debug deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporamaStart/Makefile.Debug left in tree. CONFLICT (modify/delete): src/ffDiaporama/object_script.ffDiaporama.Release deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporama/object_script.ffDiaporama.Release left in tree. CONFLICT (modify/delete): src/ffDiaporama/object_script.ffDiaporama.Debug deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporama/object_script.ffDiaporama.Debug left in tree. Auto-merging src/ffDiaporama/mainwindow.ui CONFLICT (content): Merge conflict in src/ffDiaporama/mainwindow.ui Auto-merging src/ffDiaporama/mainwindow.cpp Auto-merging src/ffDiaporama/_ApplicationDefinitions.h CONFLICT (content): Merge conflict in src/ffDiaporama/_ApplicationDefinitions.h CONFLICT (modify/delete): src/ffDiaporama/Makefile.Release deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporama/Makefile.Release left in tree. CONFLICT (modify/delete): src/ffDiaporama/Makefile.Debug deleted in upstream/1.3.1 and modified in HEAD. Version HEAD of src/ffDiaporama/Makefile.Debug left in tree. Auto-merging src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp CONFLICT (content): Merge conflict in src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp Auto-merging src/engine/cDeviceModelDef.h CONFLICT (content): Merge conflict in src/engine/cDeviceModelDef.h Auto-merging src/engine/cDeviceModelDef.cpp CONFLICT (content): Merge conflict in src/engine/cDeviceModelDef.cpp Auto-merging BUILDVERSION.txt CONFLICT (content): Merge conflict in BUILDVERSION.txt Automatic merge failed; fix conflicts and then commit the result. gbp:error: git returned 1 gbp:error: Couldn't merge from "upstream/1.3.1" gbp:error: Merge failed, please resolve. > :) nice try ;) Fabrice Fabrice _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
