org.openembedded.dev: f360c05bdca8536435cf09d573b42b34d69224ff

[oe at monotone.openmoko.org]

revision:            f360c05bdca8536435cf09d573b42b34d69224ff
suspend:             org.openembedded.dev
date:                2008-04-25T15:01:22
author:              freyther at openembedded.org
branch:              org.openembedded.dev
changelog:
Mess with the tree in a unknown way due the limitations of a tool. No idea which
gsmhandset.state to delete (see the below output of mtn), drop both...

mtn: 2 heads on branch 'org.openembedded.dev'
mtn: [left]  3e22c6ee5af012d09e9027c2ade50920300fb0f2
mtn: [right] 74f4e875283dd639a1a426c4ce2930b205f84ac1
mtn: warning: orphaned node conflict on node 24181, dead parent 22904, name gsmhandset.state
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts


manifest:
format_version "1"

new_manifest [6fe9ec6a3353bc46a786d34ad12820e0bb1b969d]

old_revision [74f4e875283dd639a1a426c4ce2930b205f84ac1]

delete "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"

delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
-------------- next part --------------
#
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# 
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/900deb1f/attachment.htm