On Wed, Sep 10, 2014 at 8:47 PM, Richard Hipp <d...@sqlite.org> wrote:
> > > On Wed, Sep 10, 2014 at 10:48 PM, Matt Welland <estifo...@gmail.com> > wrote: > >> >> On Wed, Sep 10, 2014 at 5:12 PM, Richard Hipp <d...@sqlite.org> wrote: >> >>> Sometimes we will make a check-in to trunk then later decide it doesn't >>> belong there, so then move it into a branch. ( >> >> >> Isn't this only possible if no further commits have been made on the >> trunk? I suppose one possible "fix" if there have been additional commits >> is to reverse cherrypick out the change but that leaves the timeline >> without a clear visible trace of the actions. A similar option would be to >> cherrypick the post-goof commits to a new trunk and rename the goof + >> downstream commits as branch "goof" and then close (and maybe hide) it. Do >> you have a better way to do this? >> > > 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. > On reflection I agree this is a good approach. This type of thing has caused some confusion for my team in that when the >> branch of the current checkout node changes fossil does not inform the >> user. In the example a user might find themselves mysteriously on branch >> "goof" after doing "fossil update" where previously the branch was "trunk". >> The fix is to run "fossil up trunk" but that is tribal knowledge and >> non-obvious. A message from fossil when the branch changes in this scenario >> would be good IMHO. >> > > I have your request. > Thank you for considering it. > -- > 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 > > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
