This might be a bug:
1) Branch FooBranch and the trunk has a file named FooFile
2) FooFile gets renamed on the FooBranch to FooFileNew
3) A new file on FooBranch gets created, using the name FooFile
4) The FooBranch gets merged with the trunk
5) The merge status shows that FooFile was renamed to FooFileNew, which
is correct
6) The merge status also shows that FooFile has been deleted
7) The problem is that the new FooFile on the branch never got copied to
the trunk, and I was not able to find a way to get this new file from
the branch via a Fossil command. I can see the new FooFile on the
branch, but try as I might, I can't get it into the trunk.
Is this a bug? If not, how should I get this file (and it's history)
into the trunk?
Thanks,
Marty
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
