Bug 13957

Summary:	broken import due to .gear/rules
Product:	Sisyphus	Reporter:	viy <viy>
Component:	gear	Assignee:	Dmitry V. Levin <ldv>
Status:	CLOSED NOTABUG	QA Contact:	qa-sisyphus
Severity:	normal
Priority:	P2	CC:	glebfm, ldv, legion, placeholder
Version:	unstable
Hardware:	all
OS:	Linux

Description viy 2008-01-10 00:34:48 MSK

gear-srpmimport: Imported /home/ftp/pub/Linux/ALT/Sisyphus/files/SRPMS/geomview-
1.8.2-alt5.rc9.src.rpm
CONFLICT (delete/modify): .gear-rules deleted in c6f84f1aecb3b94a313a431a51389bd
4be4ef06a and modified in HEAD. Version HEAD of .gear-rules left in tree.
Automatic merge failed; fix conflicts and then commit the result.
igor@breeze src/repo/geomview.git $
igor@breeze src/repo/geomview.git $
igor@breeze src/repo/geomview.git $ git-status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       new file:   .gear/rules
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       unmerged:   .gear-rules
#       modified:   .gear-rules
#

Comment 1 Dmitry V. Levin 2008-01-10 01:00:52 MSK

(In reply to comment #0)
> gear-srpmimport: Imported /home/ftp/pub/Linux/ALT/Sisyphus/files/SRPMS/geomview-
> 1.8.2-alt5.rc9.src.rpm
> CONFLICT (delete/modify): .gear-rules deleted in c6f84f1aecb3b94a313a431a51389bd
> 4be4ef06a and modified in HEAD. Version HEAD of .gear-rules left in tree.
> Automatic merge failed; fix conflicts and then commit the result.

Вы меняли .gear-rules в HEAD, поэтому Automatic merge failed.
Это нормально.  Сочетать gear-srpmimport с обычной работой git'ом вообще сложно.