I have a fossil repo with two branches: trunk and features. My thinking
was to develop the new features requested on the features branch,
keeping the trunk branch unchanged unless something happened with the
application that required an immediate change. Then once some set of
features was done, I'd merge it back it into the trunk, which I expected
to do with something like:
fossil checkout trunk
fossil merge features
But I note that the merge documentation says that it will not move files
in trunk if they've been moved in features, only merge in the changes.
That will cause my application to break. How can I merge the entire set
of changes? Or is this wrong-headed in fossil? Should I be merging any
small changes from trunk into features instead, closing "trunk", and
making features the new trunk? (Can I change the name?)
--
Joshua Paine
LetterBlock: Web applications built with joy
http://letterblock.com/
301-576-1920
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
