On Thu, Sep 11, 2014 at 11:50 AM, Nico Williams <n...@cryptonector.com> wrote:
> On Wed, Sep 10, 2014 at 10:47 PM, Richard Hipp <d...@sqlite.org> > > On the few cases when this has happened to me, I've moved "goof" into a > new > > branch (typically "mistake") then cherry pick the follow-on check-ins > back > > over to trunk, assuming there are not to many of them. > > Eh?? That's rebasing! ;) (really) > Except that the original sequence of changes is preserved in the tree, not discarded at the next GC. That's an important difference. -- 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
