Skip to content

Update copyright/license information#959

Open
labkey-adam wants to merge 3 commits into
developfrom
fb_copyright
Open

Update copyright/license information#959
labkey-adam wants to merge 3 commits into
developfrom
fb_copyright

Conversation

@labkey-adam
Copy link
Copy Markdown
Contributor

Rationale

Per our agreement

Copy link
Copy Markdown
Contributor

@labkey-jeckels labkey-jeckels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did spot checks and the dates all looked good. However, I'm curious why this file is flipping from LabKey to UW. I have the only previous commit in the Git history. Admittedly I'm not sure who created it in the source SVN branch - is the tool finding that?

https://github.com/LabKey/wnprc-modules/blob/1c4e19c509cfa44a2020576cb032efb0faf1e257/WNPRC_u24/src/org/labkey/wnprc_u24/view/hello.jsp

@labkey-adam
Copy link
Copy Markdown
Contributor Author

I did spot checks and the dates all looked good. However, I'm curious why this file is flipping from LabKey to UW. I have the only previous commit in the Git history. Admittedly I'm not sure who created it in the source SVN branch - is the tool finding that?

https://github.com/LabKey/wnprc-modules/blob/1c4e19c509cfa44a2020576cb032efb0faf1e257/WNPRC_u24/src/org/labkey/wnprc_u24/view/hello.jsp

The GitHub UI indeed only shows a couple commits. Look at the git history in IntelliJ, though, and you should see more. That's what the tool is trying to emulate. This is what I see:

- Adam Rauch Yesterday 1:24 PM Update licenses and copyrights
- Chad Sebranek 10/13/2021 1:34 PM Sync up with changes from LabKey's fork - includes moving husbandry_frequency into wnprc schema and some other misc purchasing module changes
- F. Daniel Nicolalde 6/15/2021 2:23 PM Removing files from r24 that are not necessary.
- Josh Eckels* 10/8/2021 2:26 PM Merge WNPRC's wnprc21.3-SNAPSHOT to LabKey's release21.3-SNAPSHOT (#108)
- F. Daniel Nicolalde 6/8/2021 10:34 AM Creating new module for U24 etls to share with Oregon.
- Josh Eckels* 8/31/2020 5:35 PM Merge wnprc18.3 changes to 20.6 (#20)
- fdnicolalde 12/17/2018 10:41 AM Reorganizing files for Gradle build.
- Clay Stevens 11/8/2017 9:52 AM improved the organization of the gradle build, got jsps to actually work in the app
- jon 11/15/2016 10:43 PM Initial commit.

Likewise, try command line: git log hello.jsp vs. git log --follow hello.jsp

@labkey-adam
Copy link
Copy Markdown
Contributor Author

I did spot checks and the dates all looked good. However, I'm curious why this file is flipping from LabKey to UW. I have the only previous commit in the Git history. Admittedly I'm not sure who created it in the source SVN branch - is the tool finding that?
https://github.com/LabKey/wnprc-modules/blob/1c4e19c509cfa44a2020576cb032efb0faf1e257/WNPRC_u24/src/org/labkey/wnprc_u24/view/hello.jsp

The GitHub UI indeed only shows a couple commits. Look at the git history in IntelliJ, though, and you should see more. That's what the tool is trying to emulate. This is what I see:

- Adam Rauch Yesterday 1:24 PM Update licenses and copyrights
- Chad Sebranek 10/13/2021 1:34 PM Sync up with changes from LabKey's fork - includes moving husbandry_frequency into wnprc schema and some other misc purchasing module changes
- F. Daniel Nicolalde 6/15/2021 2:23 PM Removing files from r24 that are not necessary.
- Josh Eckels* 10/8/2021 2:26 PM Merge WNPRC's wnprc21.3-SNAPSHOT to LabKey's release21.3-SNAPSHOT (#108)
- F. Daniel Nicolalde 6/8/2021 10:34 AM Creating new module for U24 etls to share with Oregon.
- Josh Eckels* 8/31/2020 5:35 PM Merge wnprc18.3 changes to 20.6 (#20)
- fdnicolalde 12/17/2018 10:41 AM Reorganizing files for Gradle build.
- Clay Stevens 11/8/2017 9:52 AM improved the organization of the gradle build, got jsps to actually work in the app
- jon 11/15/2016 10:43 PM Initial commit.

Likewise, try command line: git log hello.jsp vs. git log --follow hello.jsp

That explains why it's changing owner, but the start date should be 2016. Hmmm...

@labkey-adam
Copy link
Copy Markdown
Contributor Author

That explains why it's changing owner, but the start date should be 2016. Hmmm...

The tool is seeing "Github" and "10/8/21" as the last commit. That's actually your commit, but it was a merge of some kind. The tool is not following in the same manner as the command line and IntelliJ. I'll see if there's anything I can do about that.

@labkey-adam
Copy link
Copy Markdown
Contributor Author

That explains why it's changing owner, but the start date should be 2016. Hmmm...

The tool is seeing "Github" and "10/8/21" as the last commit. That's actually your commit, but it was a merge of some kind. The tool is not following in the same manner as the command line and IntelliJ. I'll see if there's anything I can do about that.

When I look more closely at the IntelliJ log, I see that it's conflating multiple versions of this file, with nearly identical content (obviously). So, the 2016 jon commit was actually in the DeviceProxy module, then wnprc_r24 is mentioned later, then the wnprc_u24 version comes into being in 2021. As you probably know, git identifies renames/moves based on content matching. Claude has an idea for following more moves/copies/renames, but I'm not sure whether it'll be better or not. Or how to judge it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants