Hi Mark,
Exactly what I was looking for, thanks! I also learned a little more about
branch tracking after the git pull on my amber11 branch threw a fatal error
complaining about not knowing where to pull from. Apparently git 1.7 gives
the ability to add tracking to an existing branch (--set-upstream) that is
lacking in the older versions... Completely irrelevant though.
One other minor comment, the old commit should go first in the diff, I
think, but this should be fairly obvious to anyone making patches.
Otherwise the patch has to be applied with -R.
Thanks again for your help!
Jason
On Tue, Aug 31, 2010 at 10:26 AM, Mark Williamson <mjw.sdsc.edu> wrote:
> Jason Swails wrote:
> > Hello,
> >
> > How exactly should I submit a bug fix? Should I make the corresponding
> > change to the amber11 tree and then create a diff file vs. a specific
> commit
> > on that tree? I know *how* to create a diff file that will work with
> patch,
> > I just don't know how I'm supposed to do it with amber11 and the new git
> > repo and everything. For reference, it's my latest commit in the main
> tree
> > which I think is directly compatible with amber11.
> >
> > Thanks!
> > Jason
> >
>
>
> Hi Jason,
>
> I'm just lifting some local notes here that Andreas Goetz authored in
> the group's general howto/notes that may be of use. This assumes (as you
> say), that you want incorporate an existing change in the master tree
> over to the amber11 branch:
>
> commit 0fd5497a24a6eeaa84992cc73bbd9149a52d8659
> Author: Jason Swails <jason.swails.gmail.com>
> Date: Tue Aug 31 09:13:10 2010 -0400
>
> Add break statement to avoid throwing an error
>
>
> So, if this should be a bugfix for amber11 and you're on the master:
>
> git log
> <find commit ID> <in this case 0fd5497a24a6eeaa84992cc73bbd9149a52d8659>
> git checkout amber11
> git cherry-pick -n "commit ID"
> git diff --cached
> <check what the merge did>
> <test stuff again>
> git commit
> git push
> git log
> <find commit ID for new bug fix and last bug fix>
> git diff --no-prefix #newID..#lastID > patch.txt
>
> This is clean and avoids all these tiny commits. The patch can be applied
> in
> $AMBERHOME with
> patch -p0 -N < patch.txt
>
> I hope this goes some way to help. However, I'm still not 100% sure what
> happens after this to generate the bugfix.all and updating of the
> website (http://ambermd.org/bugfixes11.html).
>
> regards,
>
> Mark
>
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>
--
Jason M. Swails
Quantum Theory Project,
University of Florida
Ph.D. Graduate Student
352-392-4032
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Tue Aug 31 2010 - 08:30:04 PDT
