[darcs-users] bug report

Adam Megacz adam at megacz.com
Thu May 20 05:55:23 UTC 2004


Sadly this is my client's proprietary code, so I can't give you copies
of the repo(s) in question :(

This is with 0.9.20.

  - a

megacz at feynman:~/Desktop/active/ebrary/plugin$darcs pull -a megacz.com:/var/www/com/megacz/clients/ebrary/plugin/
So far so good... finished merging.
Yikes, pending has conflicts!
We have conflicts in the following files:
./WordSorting ./WordSorting/RectRouts.cpp ./WordSorting/RectRouts.h
Yikes, pending has conflicts!
Error applying patch to working dir.
Current patch is:
{
[ebrary new code import
adam at megacz.com**20040520045437] {
adddir ./WordSorting
}
}

Working patch is:
{
{
[ebrary new code import
adam at megacz.com**20040520045437] {
merger 0.0 (
addfile ./WordSorting/RectRouts.h
merger 0.0 (
addfile ./WordSorting/RectRouts.cpp
merger 0.0 (
adddir ./WordSorting
merger 0.0 (
adddir ./WordSorting
adddir ./WordSorting
)
)
)
)
}
}
{
{
adddir ./WordSorting
adddir ./WordSorting
addfile ./WordSorting/RectRouts.cpp
addfile ./WordSorting/RectRouts.h
}
}
}


-- 
"Truth is One, though the Sages know it as Many."    -- Rig Veda




More information about the darcs-users mailing list