When merging files from different branches, fossil says it's adding a file but is only checking it out without adding it to the manifest. Test case:

<verbatim>% fs branch list
  branch1
  branch2
* trunk
# The following version was for a checkin on branch1
% fs up 9c21f3ec0f foo.txt
Autosync:  http://user@127.0.0.1:9023/
                Bytes      Cards  Artifacts     Deltas
Sent:             130          1          0          0
Received:         446          9          0          0
Total network traffic: 340 bytes sent, 0 bytes received
ADD foo.txt
--------------
updated-to:   9c21f3ec0ff598e7b24980e7c3fbe40556b2a5b1 2011-03-06 10:16:14 UTC
tags:         branch1
comment:      Create foo.txt on branch1 (user: user)
"fossil undo" is available to undo changes to the working checkout.
# Based on the above output, I would expect foo.txt to have been added to the repo
% ll
total 1
-rw-r--r--  1 user  user    0 Mar 10 09:50 foo.txt
% fs stat
repository:   /usr/home/user/src/.fossils/test.fossil
local-root:   /usr/home/user/src/test/
server-code:  56efbf780dd31210ab1bd80be67ee2efc698440e
checkout:     2f4775795dcc7eba912ebb7756e33f7d2b101427 2011-03-08 10:03:46 UTC
parent:       f08368775537689a60c4b862c0896a33a23aa9dc 2011-03-08 09:56:13 UTC
tags:         trunk
comment:      Some checkin msg. (user: user)
% fs add spammers.pftable 
ADDED  foo.txt</verbatim>

`fossil up VERSION filename` doesn't add the file to the current branch