On Fri, 25 May 2012 17:41:44 +0000 <org.fossil-scm.fossil-us...@io7m.com> wrote:
> On Fri, 25 May 2012 13:34:54 -0400 > Richard Hipp <d...@sqlite.org> wrote: > > > I don't think so, not other than checking each one out and > > recommitting them one by one. To do otherwise would be changing the > > history of the project, which Fossil does not allow (by design). > > That's fine. > > Which commands should I use to do the above? I want to avoid screwing > things up even further, so I'd like to be sure... Expecting disaster, I made a copy of the database. I shunned the merge commit from the web interface. Then, for each commit in the private branch, I attempted to merge the private commit with the current trunk (which had not changed since the start of the private branch). Within two commits, I somehow had merge conflicts (how is that even possible?) and files from a commit that I'd not yet merged. Assuming I'd done something wrong, I went back to the original copy of the database and tried again. Same result. I give up. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
