Here is the test sequence: cd fossils fossil new testrepo.fossil mkdir ../testrepo cd ../testrepo fossil open ../fossils/testrepo.fossil fossil branch new myfirstbranch trunk fossil commit --allow-empty --branch myfirstbranch -m "A new branch" fossil commit --allow-empty --branch myfirstbranch -m "A new branch, again?" fossil update trunk fossil merge myfirstbranch fossil commit -m "merged myfirstbranch" fossil branch ls fossil merge myfirstbranch --force fossil commit -m "merged myfirstbranch" --allow-empty
After "fossil branch new" a new branch is created. After the first "fossil commit --branch myfirstbranch" another branch is created by the same name as the first branch. After the second "fossil commit --branch myfirstbranch" no new branch is created, commited to the same branch as the after the first "fossil commit --branch myfirstbranch" After fossil merge myfirstbranch, then commit, only the branch created with "fossil commit" is merged to trunk and there is still an open leaf on a branch with name "myfirstbranch" Listing branches still shows that myfirstbranch exists. Trying to merge again gives the message of "no-op", a force merely tries to merge the branch created by "fossil commit" again. The open leafed branch cannot be merged. I believe this is a bug. I'm bewildered as to how to resolve this situation.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
