[darcs-users] recovering changes trashed by conflicting ./addfile patches

[Craig M.Lennox]

Cheers, all.

It appears I've done something very foolish, darcs-wise, and I'm not
sure how best to resolve it.  I have two repositories, in either of
which I have created the same file with different contents, and what I
am trying to do is end up with a single merged file with the contents
of both.

In this fictitious illustration, repository R1 contains:

[started a shopping list
Craig M. Lennox <mirian at cosmic.com>**20040912165336]  < > {
addfile ./shopping-list.txt
hunk ./shopping-list.txt 1
+Tempestuous rubber
+Contemptuous persecuters
+Dynamic casino consumers
}

Whilst repository R2 contains:

[started a shopping list
Craig M. Lennox <mirian at cosmic.com>**20040912165529]  < > {
addfile ./shopping-list.txt
hunk ./shopping-list.txt 1
+Complaisant furniture
+Treasonous bug sleeves
+Anomalous mounds
}

What I would really like to do is pull into R1 ONLY the "hunk" part of
the patch from R2, leaving the addfile behind.  Failing that, I'd be
happy simply to pull in the entire patch and resolve the contents of
the file by hand -- but even that course of action leaves me with a
fat old merger in R1 that however I try I cannot make go away:

[started a shopping list
Craig M. Lennox <mirian at cosmic.com>**20040912165529]  < > {
merger 0.0 (
hunk ./shopping-list.txt 1
+Tempestuous rubber
+Contemptuous persecuters
+Dynamic casino consumers
merger 0.0 (
addfile ./shopping-list.txt
addfile ./shopping-list.txt
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
addfile ./shopping-list.txt
addfile ./shopping-list.txt
)
hunk ./shopping-list.txt 1
+Tempestuous rubber
+Contemptuous persecuters
+Dynamic casino consumers
)
merger 0.0 (
merger 0.0 (
addfile ./shopping-list.txt
addfile ./shopping-list.txt
)
hunk ./shopping-list.txt 1
+Complaisant furniture
+Treasonous bug sleeves
+Anomalous mounds
)
)
}

So am I truly hosed, or is there any way out of this short of major
surgery on my repository metadata?  Note that even renaming one of the
files doesn't seem to help - darcs is too clever.

Craig