On Thu, Aug 23, 2012 at 1:47 PM, Daniel Roe <daniel.r.roe.gmail.com> wrote:
> Hi,
>
> Per the recent commit:
>
> ---------- Forwarded message ----------
> From: git repository hosting <gitosis.amber.sdsc.edu>
> Date: Thu, Aug 23, 2012 at 10:23 AM
> Subject: [GIT] git repository for AMBER: RCW: Looks like someone
> forgot to tell the amber12-with-patches branch that these two bugfixes
> had already been applied to it.
>
> Should adding the bugfix to "$AMBERHOME/.patches/X_Applied_Patches/"
> now be part of the bugfix creation instructions
> (http://ambermd.org/pmwiki/index.php/Main/BugFixCreationInstructions)?
>
> -Dan
>
I'm not sure if it should be part of the instructions. A nice thing about
*not* adding this step is it's a fail-safe for people that don't commit bug
fixes to the -with-patches branch (this practice was only introduced in
Amber 11 and many of the patch contributors have been doing it another way
for much longer).
Therefore, what I had been trying out was *not* having this as part of the
instructions and just periodically running
./patch_amber.py --update --ignore-fails
in the amber12-with-patches branch, It's a little messy since most patches
will fail (all *should* fail) with a message about a previously applied
patch detected. Any patch that 'slipped through' would get applied,
though, and all patch files would be dumped into the appropriate
.patches/X_Applied_Patches folder so they could be added to the repository
and properly tracked.
At the moment it was just me doing it by hand occasionally, but I'm open to
better ideas.
Thanks!
Jason
--
Jason M. Swails
Quantum Theory Project,
University of Florida
Ph.D. Candidate
352-392-4032
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Thu Aug 23 2012 - 11:30:04 PDT
