On Tue, Jul 3, 2018 at 8:57 PM Richard Hipp <d...@sqlite.org> wrote: > On 7/3/18, Dewey Hylton <dewey.hyl...@gmail.com> wrote: > > > Essentially what I did was to commit a change to a new branch, forget I > was > > in that branch and committed another unrelated change which should have > > gone back to trunk but went into the branch. > > I made that same mistake myself, recently. See > https://www.sqlite.org/src/timeline?c=64df1189 >
This makes me feel somewhat better. :) In the end, I was able to get to where I wanted to be by executing 'fossil up <UUID>' to get back to what I considered to be "trunk" before adding a trunk tag ... I then used a series of 'merge --cherrypick' and 'commit' operations to move the individual wanted checkins back to trunk. I then closed the last leaf in the testing branch, and hid the branch. Thanks to all who responded! The solution ended up being much less messy than I anticipated, and was solved much quicker as well. This is a great community.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
