Repo + tags out of sync with GIT_TOP on afs

[pcdshub]

Repo + tags out of sync with GIT_TOP on afs

[mcb64]

I'd be happy to do the merge / pull request thing... just let me know what version / repository / branch I should be merging into. And use *really* tiny words... ;-) --Mike

…

________________________________ From: K Lauer <[email protected]> Sent: Wednesday, May 20, 2020 1:32 PM To: pcdshub/ads-ioc <[email protected]> Cc: Browne, Michael C. <[email protected]>; Mention <[email protected]> Subject: Re: [pcdshub/ads-ioc] Repo + tags out of sync with GIT_TOP on afs (#45) @mcb64<https://github.com/mcb64> it's OK, as it's partly my fault for not keeping our local mirror up-to-date. Docs on the branch/PR https://pcdshub.github.io/development.html - but the basic gist is "make a feature branch, open a pull request into master, review + merge, tag". I think what we might want to do here is leave R0.2.3 as-is, but then bring in your changes to the our primary repository (here on github) as a separate PR. I'm open to suggestions though (@ZLLentz<https://github.com/ZLLentz>?) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#45 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AH3RBO5YX5EDB2DK42TZB53RSQ46DANCNFSM4NGH6TQQ>.

[klauer]

/afs/slac/g/cd/swe/git/repos/package/epics/ioc/common/ads-ioc.git has:

commit 5253effb9265dd37b22ebf3ce9f03a665b660a34
Author: Michael Browne <[email protected]>
Date:   Tue Apr 21 09:24:17 2020 -0700

    Damn it, update version number!

commit b2ededafa61e04ac7476e335082b50e638247bd6
Author: Michael Browne <[email protected]>
Date:   Mon Apr 20 16:44:36 2020 -0700

    Move to latest releases.

commit cefd4ac530bddfd5bac414ee0f85142efb8c833d
Author: Michael Browne <[email protected]>
Date:   Fri Apr 3 13:04:50 2020 -0700

    In-progress checkin.

commit b777b3f4194f36b987755f0cc87a98e9a4ebe9be
Merge: a79339b 45cee94
Author: K Lauer <[email protected]>
Date:   Tue Mar 3 14:10:49 2020 -0800

    Merge pull request #35 from klauer/add_pytmc_version_check

    ENH/FIX: check pytmc version prior to building

making b777b3f the point at which the repositories diverge

[mcb64]

Not at all, sorry, I'm a git noob... is there a page about the workflow somewhere? --Mike

…

________________________________ From: K Lauer <[email protected]> Sent: Wednesday, May 20, 2020 12:34 PM To: pcdshub/ads-ioc <[email protected]> Cc: Browne, Michael C. <[email protected]>; Mention <[email protected]> Subject: [pcdshub/ads-ioc] Repo + tags out of sync with NFS (#45) @mcb64<https://github.com/mcb64> if possible, would you mind using pull requests in the future for updates? We primarily follow the pull request/review model for the rest of our projects. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#45>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AH3RBO4ZM6NH6CH3BRH3ZLDRSQWEDANCNFSM4NGH6TQQ>.

[klauer]

@mcb64 it's OK, as it's partly my fault for not keeping our local mirror up-to-date. Docs on the branch/PR https://pcdshub.github.io/development.html - but the basic gist is "make a feature branch, open a pull request into master, review + merge, tag".

I think what we might want to do here is leave R0.2.3 as-is, but then bring in your changes to the our primary repository (here on github) as a separate PR. I'm open to suggestions though (@ZLLentz?)

[klauer]

We're back in sync: /afs/slac/g/cd/swe/git/repos/package/epics/ioc/common/ads-ioc.git
is at cd19ece (merge of #46) 👍