Bug 1285659

Summary: vim FTBFS: error: line 1: Unknown tag: <<<<<<< HEAD
Product: [Fedora] Fedora Reporter: Petr Pisar <ppisar>
Component: vimAssignee: Karsten Hopp <karsten>
Status: CLOSED RAWHIDE QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: rawhideCC: ignatenko, karsten, moshima.web
Target Milestone: ---   
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2015-11-30 11:02:19 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:

Description Petr Pisar 2015-11-26 08:18:00 UTC
Current master HEAD (31a482c27730e86d2eb8aab743e770e02831bb0d) fails to build in F24 because of a syntax error in the vim.spec:

Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target x86_64 --nodeps /builddir/build/SPECS/vim.spec'] with env {'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\x1b]0;<mock-chroot>\x07<mock-chroot>"', 'LANG': 'en_US.UTF-8', 'HOME': '/builddir', 'SHELL': '/bin/bash', 'CCACHE_DIR': '/tmp/ccache', 'TERM': 'vt100', 'CCACHE_UMASK': '002', 'HOSTNAME': 'mock'} and shell False
error: line 1: Unknown tag: <<<<<<< HEAD

Comment 1 Karsten Hopp 2015-11-30 11:02:19 UTC
fixed wit the latest update