Jed Brown <[email protected]> writes: > "Garth N. Wells" <[email protected]> writes: > >> I tried both. In the first instance, with the cherry-pick command the >> change appeared in master, but it still appeared on Bitbucket in the >> next branch as being ahead of master. This is confusing because it's >> then unclear whether or not a change has made its way into master. > > The mistake was committing 30f44156cf520 on 'next'.
Argh, s/30f44156cf5/b33fe1c366b/. I pasted the parent commit rather than the commit. Anyway, this one was made on 'next', and should have been made on 'master' (or in a topic branch). commit b33fe1c366bf2c5a529c1ece917f3855f0da61e3 Author: Garth N. Wells <[email protected]> Date: Sat May 11 11:47:42 2013 +0100 .gitignore additions > Its parent was a merge in 'next', with everything else in 'next' as > ancestors. Thus it is not possible to get 30f44156cf520 in your > branch without rewriting it (creating a new SHA1). > > You would rewrite it to have a different parent using > > git cherry-pick 30f44156cf520 > > leaving two versions in your history (30f44156cf520 in 'next' and the > new version in your topic branch/'master'). After the mistake of > committing on 'next' and pushing the result, this cherry-pick is the > best outcome. There will only be one version of the commit after you > release and rewind 'next', so it's only temporary clutter. _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
