On the trunk, User A renames foo.txt to foobar.txt (using the mv
command). Then User A immediately creates a new file called foo.txt
(uses the add command). After this and other file changes, a commit is
performed. All appears fine.
User B and User C are working on their branches. User B merges with the
trunk, and their existing copy of foo.txt is deleted by Fossil during
the merge. foo.txt remains on the trunk for all to see, but User B
cannot get it from a merge.
User C also does a merge with the trunk, but Fossil does not delete
foo.txt in their case. So foo.txt and foobar.txt is added to their
branch just fine.
User B (after much consternation) must checkout the trunk and merge with
selected commits from their branch in order to get their work into the
trunk.
Seems like there's a bug somewhere, but maybe there was an improper
sequence of user events?
Marty Backe
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
