Suppose you have the "trunk" branch checked out and you have made changes to
file xyz.txt locally, but have not checked them in. Then you do a merge of
branch "other-branch":
fossil merge other-branch
The file xyz.txt has been deleted in other-branch. What should fossil's
response be? Should it retain the locally edited copy of xyz.txt, or should
it delete file xyz.txt?
If you have not made any local edits to xyz.txt when you do the merge, then
Fossil will delete the file. That seems like the right thing to do. But
I'm less clear on what the right thing to do is if you have made local
edits. Suggestions are appreciated.
Please remember that by "delete the file" you are not really losing any
information. Historical versions of the file remain in the repository
forever. And even if your local edits are deleted, they can be recovered
using "fossil undo".
--
D. Richard Hipp
[email protected]
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
