On Fri, Feb 10, 2012 at 16:15, Richard Hipp <d...@sqlite.org> wrote: > > > On Fri, Feb 10, 2012 at 4:07 PM, Leo Razoumov <slonik...@gmail.com> wrote: >> >> On Fri, Feb 10, 2012 at 15:54, Richard Hipp <d...@sqlite.org> wrote: >> > >> > fossil update D >> > fossil merge --cherrypick P1 >> > fossil commit --branch P1p >> > fossil merge --cherrypick P2 >> > fossil commit --tag P2p >> > fossil merge --cherrypick P3 >> > fossil commit --tag P3p >> > >> >> Richard, >> thanks for the suggestion. Will I have to manually provide commit >> messages for each commit? > > > Yes. And you'll need to manually resolve any merge conflicts that come up > to.
I agree about merge conflicts. But as far as commit messages are concerned I hope that fossil could pre-populate the message with the text from the commit that is being cherry-picked. It would save lots of typing. --Leo-- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
