On 6/13/2017 3:05 PM, Joerg Sonnenberger wrote:
On Tue, Jun 13, 2017 at 02:44:31PM -0500, The Tick wrote:
Thanks, that is what I was looking for. I've set up a test respository and
things look good until I get to the final "merge" step:
$ f init F.fossil
$ f open F.fossil
$ f add project
$ f commit --tag 1.5 --branch Official
$ f tag add --propagate Official 0dd97cd973
$ f co trunk
$ f add project
$ f commit
This part is the problem. You are missing the merge of 1.5 unto trunk.
That did it -- very cool. Thanks.
$ f init F.fossil
$ f open F.fossil
$ f add project/
$ f commit --tag 1.5 --branch Official
$ f tag add --propagate Official 1.5
$ f co trunk
$ f merge 1.5
$ f commit
# Make some local changes
$ f commit
$ f co Official
# Remove all files and unpack latest version
$ f addremove
$ f commit --tag 1.6
$ f co trunk
$ f merge 1.6
$ f commit
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
