Typo correction below:
On Sun, Feb 20, 2011 at 10:52:44PM -0500, Scott Brozell wrote:
> Hi,
>
> On Sun, Feb 20, 2011 at 10:01:24PM -0500, Jason Swails wrote:
> > I haven't been getting any amber_web git notifications (and I periodically
> > pull it, too, so I know there have been updates I haven't been getting
> > emails about).
>
> ok, thx
>
> > About the new branch -- if amber11 is *not* the same as the new
> > amber11-with-patches branch, can we just get rid of amber11 and replace it
> > with the amber11-with-patches branch? I also vote for a standardized bug
>
> I think that is the resolution from the other recent thread.
> Here is how i made amber11-with-patches :
> gitco -b origin/amber11-with-patches v_11
> git branch -a
> patch -p0 -N < ../../../web/bugfixes/AmberTools/1.4/bugfix.all
> gitst
> git ls-files -o | xargs -t git-add
> git ls-files -m | xargs -t git-add
> gitci
> git pull # this didnt do anything so i goooogggled around:
yikes !!!!
git push # this didnt do anything so i goooogggled around:
;-!
> gitco master
> gitco -b amber11-with-patches origin/amber11-with-patches
> git push origin amber11-with-patches:amber11-with-patches
> # this last one seems to be the key to getting git push to work,
> but it is still curious that there was no email notification:
> http://stackoverflow.com/questions/1391732/git-says-everything-up-to-date-when-pushing-changes-to-a-remote-branch
>
> % alias gitst
> git status -u !* |& less
> % a gitco
> git checkout !*
> % a gitci
> git commit !*
>
> > fix protocol; the one Mark suggested to me on the mailing list some time ago
> > works pretty well (with a couple minor mods, including how to add the bugfix
> > to bugfix.all)
> >
> > http://dev-archive.ambermd.org/201008/0050.html
>
> The <test stuff again> step should include careful verification
> of changed test results, if any, and their subsequent updating
> and inclusion in the bugfix.
>
> > I think I have a fairly good system for updating the amber11 git branch (the
> > way it *should* be maintained) and using that branch to generate bugfixes.
> > I can draft a protocol and send it to this list for so it can be tweaked.
> >
> > What do people think?
>
> Great, if it's easy and clear then hopefully people will use it;
> right now git has only made it more difficult for some to make bugfixes.
>
> scott
>
> > On Sun, Feb 20, 2011 at 9:48 PM, Scott Brozell <sbrozell.rci.rutgers.edu>wrote:
> >
> > > I just pushed a commit to amber_web and did not see an email
> > > notification. It doesn't look like there have been any:
> > > grep 'git repository for AMBER_' mail/cvs-notification-bounces
> > >
> > > I'm just trying to verify that bugfix 17 for ambertools was
> > > really pushed. BTW, that may not really become a public bugfix.
> > >
> > > Also i didn't get an email notification when i made in amber git
> > > origin/amber11-with-patches
> > >
>
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Sun Feb 20 2011 - 20:30:03 PST
