[ Thread Index |
Date Index
| More lists.tuxfamily.org/slitaz Archives
]
- To: slitaz@xxxxxxxxxxxxxxxxxxx
- Subject: hg error
- From: Allan Pinto <allan316@xxxxxxxxx>
- Date: Wed, 3 Jun 2009 03:55:28 +0000
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=l5QBXf96qTeGfrMzRnJn77B9L+o2sIKcGrx7WBzZwgM=; b=dlSyY7oxFui7Nnz6zH0NcWIJQymSAGuSsGLXq/3FRrjXe2GjJ5Iuksf3Fdyn8B/M3+ RMvKd5TGf1oFOGqOvgoVu3/5fKiYL5CspMUAHr/mhecHpAqgfQPrwIMMcdm5q9dhoIgW KWeXc+d6rwQFBqx9zPslJli+ONH4sEO0u7MjY=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=ojyQLrfcUGrMZDnU/nZDCEsp5HNgAXeoxu5b6hRryG0hErblGarTGqFxUT4co6sORb iaIWTZYjDbb3KWbG71FBwwaR9LQ3eXk2U8X0ZfdJzKUmvG78LBJOhBIAmcyfJy6cW0Jw xu37VX4zWnXWfXbF5ds40yrVCBFigVlhzO4ps=
Was trying to commit a change to espeak,
did hg pull,
hg update,
hg commit espeak ( after doin g the change in the receipt)
hg push gives me a hg merge error saying two heads have been formed.
now i cant commit espeak again
--
Thanx and regd's.
Allan.
http://www.in2dwok.com
---
SliTaz GNU/Linux Mailing list - http://www.slitaz.org/