Bug 13957 - broken import due to .gear/rules
Summary: broken import due to .gear/rules
Status: CLOSED NOTABUG
Alias: None
Product: Sisyphus
Classification: Development
Component: gear (show other bugs)
Version: unstable
Hardware: all Linux
: P2 normal
Assignee: Dmitry V. Levin
QA Contact: qa-sisyphus
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-01-10 00:34 MSK by viy
Modified: 2008-01-10 08:46 MSK (History)
4 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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'ом вообще сложно.