#70: strange git error
----------------------+-----------------------------------------------------
Reporter: jgoerzen | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: git | Version: 0.9
Keywords: |
----------------------+-----------------------------------------------------
While converting Linux kernel tree to darcs:
{{{
$ tailor -D -v --configfile git.tailor
15:05:52 [I] Updating "project" in "/home/jgoerzen/work/git2/work"
15:05:52 [I] Applying pending upstream changesets
15:05:52 [I] Changeset "97665e9c22991401dc56968619c6b8b9c09f3268"
15:05:52 [I] Log message: [PATCH] scsi: remove unused
scsi_cmnd->internal_timeout field
scsi_cmnd->internal_timeout field doesn't have any meaning
anymore. Kill the field.
Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
15:05:52 [I] /home/jgoerzen/work/git2/work $ git merge -n --no-commit
fastforward HEAD 97665e9c22991401dc56968619c6b8b9c09f3268
git-read-tree: fatal: Entry 'drivers/scsi/scsi.c' would be overwritten by
merge. Cannot merge.
No merge strategy handled the merge.
15:05:52 [W] [Status 2]
Output stream:
Merging HEAD with 97665e9c22991401dc56968619c6b8b9c09f3268
Merging:
c2a9331c62216e222a08de8dd58559367fef0af6 updates for CFQ oops fix
97665e9c22991401dc56968619c6b8b9c09f3268 [PATCH] scsi: remove unused
scsi_cmnd->internal_timeout field
found 1 common ancestor(s):
a757e64cfa400391041ed7953f0290c34a820c93 [PATCH] md: remove a number of
misleading calls to MD_BUG
15:05:52 [C] Couldn't apply changeset
15:05:52 [C] Upstream change application failed
Failure applying upstream changes: /home/jgoerzen/work/git2/work $ git
merge -n --no-commit fastforward HEAD
97665e9c22991401dc56968619c6b8b9c09f3268 failed
[EMAIL PROTECTED]:~/work/git2$
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/70>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
