On Sat, Jul 14, 2012 at 1:10 AM, Richard Hipp <d...@sqlite.org> wrote:
> > > On Fri, Jul 13, 2012 at 10:42 PM, Stephan Beal <sgb...@googlemail.com>wrote: > >> On Sat, Jul 14, 2012 at 4:29 AM, Richard Hipp <d...@sqlite.org> wrote: >> >>> I think (2) since that way we don't have to worry about causing >>> accidental collisions with preexisting custom pages when we add new >>> built-in pages in the future. >>> >> >> That's my conclusion as well. If we want them to be safely syncable, i >> think (2) is our only realistic option. >> >> Do the th1 additions i've made so far seem acceptable? Here's a quick >> demo: >> >> >> http://www.fossil-scm.org/index.html/artifact/379f9006ea3c43584925cc276e95c43f6d22e726 >> >> :-? >> > > To help answer questions like this, I added options to make it easier to > see all the changes in a branch. For my changes to accomplish this, see: > > http://www.fossil-scm.org/fossil/vdiff?branch=root-tag > > For Stephan's branch, see: > > http://www.fossil-scm.org/fossil/vdiff?branch=th3-query-api > Correction: http://www.fossil-scm.org/fossil/vdiff?branch=th1-query-api Also, clearly, I need to work on error messages. > > One can also do: > > fossil diff -y --branch root-tag > fossil diff -y --branch th3-query-api > > There is a new tagging option to accomplish this. "root:BRANCH" is > checkin on the parent branch of BRANCH from which BRANCH is derived. Using > the --branch XYZ option on "diff" is the same as doing --from root:XYZ --to > XYZ > > I made this change on very little sleep so it is still in a branch > itself. Please look it over and if there are no problems, I'll merge it > into trunk. > > >> >> -- >> ----- stephan beal >> http://wanderinghorse.net/home/stephan/ >> http://gplus.to/sgbeal >> >> >> _______________________________________________ >> fossil-users mailing list >> fossil-users@lists.fossil-scm.org >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> >> > > > -- > D. Richard Hipp > d...@sqlite.org > -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
