Am Montag, 14. Februar 2011 schrieb Ritesh Raj Sarraf: > Package: fio > Version: 1.38-1 > Severity: wishlist > > Hello Martin,
Hello Ritesh, > There's a new upstream release for fio, version 1.50. > Could you please package it? Yes. But I need to resolve on issue with a merge conflict with git-import-orig first. I already had this once and resolved it by manually marking which file to use. But apparently this wasn't a permanent fix. This time I want to fix it for real. I will ask Sebastian Harl for help tomorrow, cause I do not know how to do it. In case you have an idea please hint me at it. I think there shouldn't be a merge conflict at all or possibly only regarding the makefile that I adapted. I guess there is something wrong with my master branch on collab-maint/fio. It seems to think that all files were locally changed which obviously is not true, cause I only adapted the Makefile (as in debian patch). Here is a copy of the issue: ms@mango:~/lokal/Debian/fio> git clone git+ssh://martin21- gu...@git.debian.org/git/collab-maint/fio.git Cloning into fio... remote: Counting objects: 445, done. remote: Compressing objects: 100% (195/195), done. remote: Total 445 (delta 236), reused 445 (delta 236) Receiving objects: 100% (445/445), 258.84 KiB, done. Resolving deltas: 100% (236/236), done. ms@mango:~/lokal/Debian/fio> cd fio ms@mango:~/lokal/Debian/fio/fio> git checkout -b pristine-tar remotes/origin/pristine-tar Branch pristine-tar set up to track remote branch pristine-tar from origin. Switched to a new branch 'pristine-tar' ms@mango:~/lokal/Debian/fio/fio> git checkout -b upstream remotes/origin/pristine-tar Branch upstream set up to track remote branch pristine-tar from origin. Switched to a new branch 'upstream' ms@mango:~/lokal/Debian/fio/fio> git checkout master Switched to branch 'master' ms@mango:~/lokal/Debian/fio/fio> git-import-orig --pristine-tar ../fio_1.50.2.orig.tar.gz What is the upstream version? [1.50.2] gbp:info: Importing '../fio_1.50.2.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is fio gbp:info: Upstream version is 1.50.2 /usr/bin/pristine-tar: committed fio_1.50.2.orig.tar.gz.delta to branch pristine-tar gbp:info: Merging to 'master' Auto-merging HOWTO CONFLICT (add/add): Merge conflict in HOWTO Auto-merging Makefile CONFLICT (add/add): Merge conflict in Makefile Auto-merging Makefile.FreeBSD CONFLICT (add/add): Merge conflict in Makefile.FreeBSD Auto-merging Makefile.mac CONFLICT (add/add): Merge conflict in Makefile.mac Auto-merging Makefile.solaris CONFLICT (add/add): Merge conflict in Makefile.solaris Auto-merging README CONFLICT (add/add): Merge conflict in README Auto-merging arch/arch-ia64.h CONFLICT (add/add): Merge conflict in arch/arch-ia64.h Auto-merging arch/arch-ppc.h CONFLICT (add/add): Merge conflict in arch/arch-ppc.h Auto-merging arch/arch-x86.h CONFLICT (add/add): Merge conflict in arch/arch-x86.h Auto-merging arch/arch-x86_64.h CONFLICT (add/add): Merge conflict in arch/arch-x86_64.h Auto-merging blktrace.c CONFLICT (add/add): Merge conflict in blktrace.c Auto-merging blktrace_api.h CONFLICT (add/add): Merge conflict in blktrace_api.h Auto-merging cgroup.c CONFLICT (add/add): Merge conflict in cgroup.c Auto-merging compiler/compiler.h CONFLICT (add/add): Merge conflict in compiler/compiler.h Auto-merging crc/crc32c-intel.c CONFLICT (add/add): Merge conflict in crc/crc32c-intel.c Auto-merging crc/crc32c.h CONFLICT (add/add): Merge conflict in crc/crc32c.h Auto-merging crc/sha256.c CONFLICT (add/add): Merge conflict in crc/sha256.c Auto-merging crc/sha512.c CONFLICT (add/add): Merge conflict in crc/sha512.c Auto-merging debug.h CONFLICT (add/add): Merge conflict in debug.h Auto-merging diskutil.c CONFLICT (add/add): Merge conflict in diskutil.c Auto-merging engines/guasi.c CONFLICT (add/add): Merge conflict in engines/guasi.c Auto-merging engines/libaio.c CONFLICT (add/add): Merge conflict in engines/libaio.c Auto-merging engines/mmap.c CONFLICT (add/add): Merge conflict in engines/mmap.c Auto-merging engines/net.c CONFLICT (add/add): Merge conflict in engines/net.c Auto-merging engines/posixaio.c CONFLICT (add/add): Merge conflict in engines/posixaio.c Auto-merging engines/sg.c CONFLICT (add/add): Merge conflict in engines/sg.c Auto-merging engines/skeleton_external.c CONFLICT (add/add): Merge conflict in engines/skeleton_external.c Auto-merging engines/solarisaio.c CONFLICT (add/add): Merge conflict in engines/solarisaio.c Auto-merging engines/splice.c CONFLICT (add/add): Merge conflict in engines/splice.c Auto-merging engines/sync.c CONFLICT (add/add): Merge conflict in engines/sync.c Auto-merging engines/syslet-rw.c CONFLICT (add/add): Merge conflict in engines/syslet-rw.c Auto-merging eta.c CONFLICT (add/add): Merge conflict in eta.c Auto-merging fifo.h CONFLICT (add/add): Merge conflict in fifo.h Auto-merging file.h CONFLICT (add/add): Merge conflict in file.h Auto-merging filesetup.c CONFLICT (add/add): Merge conflict in filesetup.c Auto-merging fio.1 CONFLICT (add/add): Merge conflict in fio.1 Auto-merging fio.c CONFLICT (add/add): Merge conflict in fio.c Auto-merging fio.h CONFLICT (add/add): Merge conflict in fio.h Auto-merging fio_generate_plots CONFLICT (add/add): Merge conflict in fio_generate_plots Auto-merging fio_generate_plots.1 CONFLICT (add/add): Merge conflict in fio_generate_plots.1 Auto-merging gettime.c CONFLICT (add/add): Merge conflict in gettime.c Auto-merging helpers.c CONFLICT (add/add): Merge conflict in helpers.c Auto-merging helpers.h CONFLICT (add/add): Merge conflict in helpers.h Auto-merging init.c CONFLICT (add/add): Merge conflict in init.c Auto-merging io_ddir.h CONFLICT (add/add): Merge conflict in io_ddir.h Auto-merging io_u.c CONFLICT (add/add): Merge conflict in io_u.c Auto-merging ioengine.h CONFLICT (add/add): Merge conflict in ioengine.h Auto-merging ioengines.c CONFLICT (add/add): Merge conflict in ioengines.c Auto-merging iolog.h CONFLICT (add/add): Merge conflict in iolog.h Auto-merging lib/ffz.h CONFLICT (add/add): Merge conflict in lib/ffz.h Auto-merging log.c CONFLICT (add/add): Merge conflict in log.c Auto-merging log.h CONFLICT (add/add): Merge conflict in log.h Auto-merging memory.c CONFLICT (add/add): Merge conflict in memory.c Auto-merging mutex.c CONFLICT (add/add): Merge conflict in mutex.c Auto-merging options.c CONFLICT (add/add): Merge conflict in options.c Auto-merging os/os-freebsd.h CONFLICT (add/add): Merge conflict in os/os-freebsd.h Auto-merging os/os-linux.h CONFLICT (add/add): Merge conflict in os/os-linux.h Auto-merging os/os-mac.h CONFLICT (add/add): Merge conflict in os/os-mac.h Auto-merging os/os-solaris.h CONFLICT (add/add): Merge conflict in os/os-solaris.h Auto-merging os/os.h CONFLICT (add/add): Merge conflict in os/os.h Auto-merging parse.c CONFLICT (add/add): Merge conflict in parse.c Auto-merging smalloc.c CONFLICT (add/add): Merge conflict in smalloc.c Auto-merging stat.c CONFLICT (add/add): Merge conflict in stat.c Auto-merging time.c CONFLICT (add/add): Merge conflict in time.c Auto-merging verify.c CONFLICT (add/add): Merge conflict in verify.c Auto-merging verify.h CONFLICT (add/add): Merge conflict in verify.h Automatic merge failed; fix conflicts and then commit the result. gbp:error: git returned 1 gbp:error: Couldn't merge from "upstream/1.50.2" gbp:error: Merge failed, please resolve. Ciao, -- Martin Steigerwald - team(ix) GmbH - http://www.teamix.de gpg: 19E3 8D42 896F D004 08AC A0CA 1E10 C593 0399 AE90
signature.asc
Description: This is a digitally signed message part.
