Not sure if this should go here or in the mail-list, but I've encountered the following
problem:

<verbatim>C:\test>fossil new test.fossil && fossil open test.fossil
project-id:
server-id:
admin-user: User (initial password is "62d5e3")

C:\test>echo A>foo.txt && fossil add foo.txt
ADDED  foo.txt

C:\test>fossil ci -m "Added foo.txt"
New_Version:

C:\test>echo B>foo.txt

C:\test>fossil ci -m "Branching off the trunk" --private
New_Version:

C:\test>echo C>foo.txt && fossil ci -m "Working"
New_Version:

C:\test>move foo.txt bar.txt && fossil mv foo.txt bar.txt
RENAME foo.txt bar.txt

C:\test>fossil ci -m "Renaming"
New_Version:

C:\test>echo D>foo.txt && fossil add foo.txt
ADDED  foo.txt

C:\test>fossil ci -m "Adding (new) foo.txt"
New_Version:

C:\test>fossil co trunk
foo.txt

C:\test>fossil merge private
UPDATE foo.txt
RENAME foo.txt -> bar.txt
"fossil undo" is available to undo changes to the working checkout.

C:\test>fossil ci -m "Private changes"
New_Version:

C:\test>fossil ls
bar.txt
</verbatim>

then foo.txt was restored from an extrenal source (same version as in private brunch) because I had no time to check what was happened; and
now I cannot merge at all:</em>

<verbatim>
C:\test>fossil ci -m "Added back foo.txt"
New_Version:

C:\test>fossil co private
bar.txt
foo.txt

C:\test>echo E>foo.txt && fossil ci -m "WIP"
New_Version:

C:\test>fossil co trunk
bar.txt
foo.txt

C:\test>fossil merge -n private
MERGE bar.txt
MERGE foo.txt
***** 1 merge conflicts in foo.txt
RENAME foo.txt -> bar.txt
SQLITE_CONSTRAINT: abort at 37 in [UPDATE vfile SET pathname='bar.tx
t', origname=coalesce(origname,pathname) WHERE id=8 AND vid=12]: columns pathname, vid are not uniqu
e
columns pathname, vid are not unique
UPDATE vfile SET pathname='bar.txt', origname=coalesce(origname,pathname) WHERE id=8 AND vid=12

If you have recently updated your fossil executable, you might
need to run "fossil all rebuild" to bring the repository
schemas up to date.
SQLITE_BUSY: statement aborts at 2: [ROLLBACK] cannot rollback trans
action - SQL statements in progress
</verbatim>

Was it my fault or is it a bug? <strong>What should I do now</strong> to continue working with this repository?