Package=libfs Merge_Strategy= Interactive=no QUIET=0 Package_version= MANUAL_MERGE=no Using package libfs Warning: overwriting existing dir libfs Cloning from Debian repository... Initialized empty Git repository in /srv/XorgAutoPackage/libfs/.git/ Already on branch "debian-unstable" Fetching from freedesktop repository... remote: Generating pack... remote: Done counting 9 objects. remote: Result has 6 objects. remote: Deltifying 6 objects. remote: 0% (0/6) done remote: 16% (1/6) done remote: 33% (2/6) done remote: 50% (3/6) done remote: 66% (4/6) done remote: 83% (5/6) done 100% (6/6) done remote: remote: Total 6, written 6 (delta 4), reused 0 (delta 0) * refs/heads/upstream-head: storing branch 'master' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 77f3fc6 Auto-following refs/tags/MODULAR_COPY Auto-following refs/tags/PRE_xf86-4_3_0_1 Auto-following refs/tags/XACE-SELINUX-MERGE Auto-following refs/tags/XORG-6_7_99_1 Auto-following refs/tags/XORG-6_7_99_2 Auto-following refs/tags/XORG-6_7_99_901 Auto-following refs/tags/XORG-6_7_99_902 Auto-following refs/tags/XORG-6_7_99_903 Auto-following refs/tags/XORG-6_7_99_904 Auto-following refs/tags/XORG-6_8_0 Auto-following refs/tags/XORG-6_8_1 Auto-following refs/tags/XORG-6_8_1_901 Auto-following refs/tags/XORG-6_8_1_902 Auto-following refs/tags/XORG-6_8_1_903 Auto-following refs/tags/XORG-6_8_1_904 Auto-following refs/tags/XORG-6_8_2 Auto-following refs/tags/XORG-6_8_99_1 Auto-following refs/tags/XORG-6_8_99_10 Auto-following refs/tags/XORG-6_8_99_11 Auto-following refs/tags/XORG-6_8_99_12 Auto-following refs/tags/XORG-6_8_99_13 Auto-following refs/tags/XORG-6_8_99_14 Auto-following refs/tags/XORG-6_8_99_15 Auto-following refs/tags/XORG-6_8_99_16 Auto-following refs/tags/XORG-6_8_99_2 Auto-following refs/tags/XORG-6_8_99_3 Auto-following refs/tags/XORG-6_8_99_4 Auto-following refs/tags/XORG-6_8_99_5 Auto-following refs/tags/XORG-6_8_99_6 Auto-following refs/tags/XORG-6_8_99_7 Auto-following refs/tags/XORG-6_8_99_8 Auto-following refs/tags/XORG-6_8_99_9 Auto-following refs/tags/XORG-6_8_99_900 Auto-following refs/tags/XORG-6_8_99_901 Auto-following refs/tags/XORG-6_8_99_902 Auto-following refs/tags/XORG-6_8_99_903 Auto-following refs/tags/XORG-6_99_99_900 Auto-following refs/tags/XORG-6_99_99_901 Auto-following refs/tags/XORG-6_99_99_902 Auto-following refs/tags/XORG-6_99_99_903 Auto-following refs/tags/XORG-6_99_99_904 Auto-following refs/tags/XORG-7_0 Auto-following refs/tags/XORG-7_0_99_901 Auto-following refs/tags/XORG-7_1 Auto-following refs/tags/XORG-MAIN Auto-following refs/tags/lg3d-base Auto-following refs/tags/lg3d-rel-0-6-2 Auto-following refs/tags/lg3d-rel-0-7-0 Auto-following refs/tags/rel-0-6-1 Auto-following refs/tags/sco_port_update-base Auto-following refs/tags/xf86-012804-2330 Auto-following refs/tags/xf86-4_3_0_1 Auto-following refs/tags/xf86-4_3_99_16 Auto-following refs/tags/xf86-4_3_99_901 Auto-following refs/tags/xf86-4_3_99_902 Auto-following refs/tags/xf86-4_3_99_903 Auto-following refs/tags/xf86-4_3_99_903_special Auto-following refs/tags/xf86-4_4_0 Auto-following refs/tags/xf86-4_4_99_1 remote: Generating pack... remote: Done counting 0 objects. remote: Total 0, written 0 (delta 0), reused 0 (delta 0) * refs/tags/MODULAR_COPY: storing tag 'MODULAR_COPY' of git://git.freedesktop.org/git/xorg/lib/libFS commit: ea190af * refs/tags/PRE_xf86-4_3_0_1: storing tag 'PRE_xf86-4_3_0_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: eec6ef2 * refs/tags/XACE-SELINUX-MERGE: storing tag 'XACE-SELINUX-MERGE' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_1: storing tag 'XORG-6_7_99_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_2: storing tag 'XORG-6_7_99_2' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_901: storing tag 'XORG-6_7_99_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_902: storing tag 'XORG-6_7_99_902' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_903: storing tag 'XORG-6_7_99_903' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_7_99_904: storing tag 'XORG-6_7_99_904' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_0: storing tag 'XORG-6_8_0' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_1: storing tag 'XORG-6_8_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_1_901: storing tag 'XORG-6_8_1_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_1_902: storing tag 'XORG-6_8_1_902' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_1_903: storing tag 'XORG-6_8_1_903' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_1_904: storing tag 'XORG-6_8_1_904' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_2: storing tag 'XORG-6_8_2' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_1: storing tag 'XORG-6_8_99_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_10: storing tag 'XORG-6_8_99_10' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 3a9234d * refs/tags/XORG-6_8_99_11: storing tag 'XORG-6_8_99_11' of git://git.freedesktop.org/git/xorg/lib/libFS commit: e798bd7 * refs/tags/XORG-6_8_99_12: storing tag 'XORG-6_8_99_12' of git://git.freedesktop.org/git/xorg/lib/libFS commit: e798bd7 * refs/tags/XORG-6_8_99_13: storing tag 'XORG-6_8_99_13' of git://git.freedesktop.org/git/xorg/lib/libFS commit: e798bd7 * refs/tags/XORG-6_8_99_14: storing tag 'XORG-6_8_99_14' of git://git.freedesktop.org/git/xorg/lib/libFS commit: e5721d4 * refs/tags/XORG-6_8_99_15: storing tag 'XORG-6_8_99_15' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 905552d * refs/tags/XORG-6_8_99_16: storing tag 'XORG-6_8_99_16' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 905552d * refs/tags/XORG-6_8_99_2: storing tag 'XORG-6_8_99_2' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_3: storing tag 'XORG-6_8_99_3' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_4: storing tag 'XORG-6_8_99_4' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_5: storing tag 'XORG-6_8_99_5' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_6: storing tag 'XORG-6_8_99_6' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_7: storing tag 'XORG-6_8_99_7' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_8: storing tag 'XORG-6_8_99_8' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/XORG-6_8_99_9: storing tag 'XORG-6_8_99_9' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 3a9234d * refs/tags/XORG-6_8_99_900: storing tag 'XORG-6_8_99_900' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 905552d * refs/tags/XORG-6_8_99_901: storing tag 'XORG-6_8_99_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 905552d * refs/tags/XORG-6_8_99_902: storing tag 'XORG-6_8_99_902' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 516e8e2 * refs/tags/XORG-6_8_99_903: storing tag 'XORG-6_8_99_903' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 516e8e2 * refs/tags/XORG-6_99_99_900: storing tag 'XORG-6_99_99_900' of git://git.freedesktop.org/git/xorg/lib/libFS commit: b15ff0f * refs/tags/XORG-6_99_99_901: storing tag 'XORG-6_99_99_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: b7c75db * refs/tags/XORG-6_99_99_902: storing tag 'XORG-6_99_99_902' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 2404b41 * refs/tags/XORG-6_99_99_903: storing tag 'XORG-6_99_99_903' of git://git.freedesktop.org/git/xorg/lib/libFS commit: ea190af * refs/tags/XORG-6_99_99_904: storing tag 'XORG-6_99_99_904' of git://git.freedesktop.org/git/xorg/lib/libFS commit: df8de2b * refs/tags/XORG-7_0: storing tag 'XORG-7_0' of git://git.freedesktop.org/git/xorg/lib/libFS commit: df8de2b * refs/tags/XORG-7_0_99_901: storing tag 'XORG-7_0_99_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: df8de2b * refs/tags/XORG-7_1: storing tag 'XORG-7_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: df8de2b * refs/tags/XORG-MAIN: storing tag 'XORG-MAIN' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 9e8dd4f * refs/tags/lg3d-base: storing tag 'lg3d-base' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/lg3d-rel-0-6-2: storing tag 'lg3d-rel-0-6-2' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/lg3d-rel-0-7-0: storing tag 'lg3d-rel-0-7-0' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/rel-0-6-1: storing tag 'rel-0-6-1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/sco_port_update-base: storing tag 'sco_port_update-base' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f4a1380 * refs/tags/xf86-012804-2330: storing tag 'xf86-012804-2330' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 0c5c8c1 * refs/tags/xf86-4_3_0_1: storing tag 'xf86-4_3_0_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: eec6ef2 * refs/tags/xf86-4_3_99_16: storing tag 'xf86-4_3_99_16' of git://git.freedesktop.org/git/xorg/lib/libFS commit: b84549f * refs/tags/xf86-4_3_99_901: storing tag 'xf86-4_3_99_901' of git://git.freedesktop.org/git/xorg/lib/libFS commit: b84549f * refs/tags/xf86-4_3_99_902: storing tag 'xf86-4_3_99_902' of git://git.freedesktop.org/git/xorg/lib/libFS commit: f034595 * refs/tags/xf86-4_3_99_903: storing tag 'xf86-4_3_99_903' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 6b36837 * refs/tags/xf86-4_3_99_903_special: storing tag 'xf86-4_3_99_903_special' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 0c5c8c1 * refs/tags/xf86-4_4_0: storing tag 'xf86-4_4_0' of git://git.freedesktop.org/git/xorg/lib/libFS commit: a0ded18 * refs/tags/xf86-4_4_99_1: storing tag 'xf86-4_4_99_1' of git://git.freedesktop.org/git/xorg/lib/libFS commit: 7642992 Switched to a new branch "mybranch" Merging Debian changes... Auto-merged COPYING CONFLICT (add/add): Merge conflict in COPYING Auto-merged Makefile.am CONFLICT (add/add): Merge conflict in Makefile.am Auto-merged configure.ac CONFLICT (add/add): Merge conflict in configure.ac Auto-merged src/fs_transport.c CONFLICT (add/add): Merge conflict in src/fs_transport.c Automatic merge failed; fix conflicts and then commit the result. Merges needed # On branch mybranch # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # new file: ChangeLog # new file: Makefile.in # new file: aclocal.m4 # new file: config.guess # new file: config.h.in # new file: config.sub # new file: configure # new file: debian/changelog # new file: debian/compat # new file: debian/control # new file: debian/copyright # new file: debian/libfs-dev.install # new file: debian/libfs6.install # new file: debian/rules # new file: debian/watch # new file: depcomp # new file: install-sh # new file: ltmain.sh # new file: missing # new file: mkinstalldirs # new file: src/Makefile.in # # Changed but not updated: # (use "git add ..." to update what will be committed) # # unmerged: COPYING # modified: COPYING # unmerged: Makefile.am # modified: Makefile.am # unmerged: configure.ac # modified: configure.ac # unmerged: src/fs_transport.c # modified: src/fs_transport.c # Attempting to address merge issues automatically... Initialized empty Git repository in /srv/XorgAutoPackage/libfs-FDO-HEAD/.git/ remote: Generating pack... remote: Done counting 316 objects. remote: Deltifying 316 objects. remote: 0% (1/316) done 1% (4/316) done 2% (7/316) done remote: 3% (10/316) done 4% (13/316) done 5% (16/316) done remote: 6% (19/316) done 7% (23/316) done 8% (26/316) done remote: 9% (29/316) done 10% (32/316) done 11% (35/316) done 12% (38/316) done 13% (42/316) done remote: 14% (45/316) done 15% (48/316) done 16% (51/316) done remote: 17% (54/316) done 18% (57/316) done 19% (61/316) done remote: 20% (64/316) done 21% (67/316) done 22% (70/316) done remote: 23% (73/316) done 24% (76/316) done 25% (79/316) done remote: 26% (83/316) done 27% (86/316) done 28% (89/316) done remote: 29% (92/316) done 30% (95/316) done 31% (98/316) done 32% (102/316) done remote: 33% (105/316) done 34% (108/316) done 35% (111/316) done 36% (114/316) done remote: 37% (117/316) done 38% (121/316) done 39% (124/316) done remote: 40% (127/316) done 41% (130/316) done 42% (133/316) done remote: 43% (136/316) done 44% (140/316) done 45% (143/316) done 46% (146/316) done 47% (149/316) done 48% (152/316) done remote: 49% (155/316) done 50% (158/316) done 51% (162/316) done 52% (165/316) done 53% (168/316) done 54% (171/316) done remote: 55% (174/316) done 56% (177/316) done 57% (181/316) done remote: 58% (184/316) done remote: 59% (187/316) done remote: 60% (190/316) done remote: 61% (193/316) done remote: 62% (196/316) done remote: 63% (200/316) done remote: 64% (203/316) done 65% (206/316) done remote: 66% (209/316) done 67% (212/316) done 68% (215/316) done remote: 69% (219/316) done 70% (222/316) done 71% (225/316) done remote: 72% (228/316) done 73% (231/316) done 74% (234/316) done remote: 75% (237/316) done 76% (241/316) done remote: 77% (244/316) done remote: 78% (247/316) done 79% (250/316) done remote: 80% (253/316) done remote: 81% (256/316) done remote: 82% (260/316) done remote: 83% (263/316) done remote: 84% (266/316) done 85% (269/316) done remote: 86% (272/316) done 87% (275/316) done 88% (279/316) done remote: 89% (282/316) done 90% (285/316) done 91% (288/316) done remote: 92% (291/316) done 93% (294/316) done remote: 94% (298/316) done remote: 95% (301/316) done remote: 96% (304/316) done remote: 97% (307/316) done remote: 98% (310/316) done remote: 99% (313/316) done remote: 100% (316/316) done remote: remote: Total 316, written 316 (delta 189), reused 305 (delta 183) # unmerged: Makefile.am + Discarding Debian differences in Makefile.am COPYING: needs merge configure.ac: needs merge src/fs_transport.c: needs merge + Copying missing xsfbs into place - No available dir ../xsfbs from # unmerged: configure.ac + Discarding Debian differences in configure.ac COPYING: needs merge src/fs_transport.c: needs merge # unmerged: COPYING + Discarding Debian differences in COPYING src/fs_transport.c: needs merge You are in the middle of a conflicted merge. ERROR: 3 merge issues addressed, but more remain