HaXML

[Simon Peyton-Jones]

Malcolm

When doing a darcs pull I got conflicts on HaXml/configure.  Surely that should not be in the repo -- it's generated by autoconf or something isn't it?

Simon

== running darcs pull -av --repodir libraries/HaXml
Pulling from "http://darcs.haskell.org/packages/HaXml"...
We have the following new (to them) patches:
They have the following patches to pull:
Tue Jun 17 16:52:00 BST 2008  Malcolm.Wallace at cs.york.ac.uk
  * version bump the docs as well
Tue Jun 17 16:47:46 BST 2008  Malcolm.Wallace at cs.york.ac.uk
  * another version bump (1.19.4) for module missing from source dist
Tue Jun 17 10:11:19 BST 2008  Malcolm.Wallace at cs.york.ac.uk
  * bump version to 1.19.3
Getting and merging the following patches:
[bump version to 1.19.3
Malcolm.Wallace at cs.york.ac.uk**20080617091119]
[another version bump (1.19.4) for module missing from source dist
Malcolm.Wallace at cs.york.ac.uk**20080617154746]
[version bump the docs as well
Malcolm.Wallace at cs.york.ac.uk**20080617155200]
diffing dir...
We have conflicts in the following files:
./configure