jkesselm commented on PR #103: URL: https://github.com/apache/xalan-java/pull/103#issuecomment-1766904894
OK. Let's walk through this. Clone (reverted) head. Confirm status: ``` [keshlam@goldtooth xalan-java]$ git log --oneline | head -n 10 92781cb4 Merge pull request #66 from mukulga/xalan-j_master_mukul be0d250e committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet. 690bd044 Merge pull request #5 from jkesselm/master 6f418abf Revert default indent-amount 3a624b30 increasing the default indent amount for the xalanj document serializer. this makes it little bit easier to view xalanj xslt transformation result. doing this xalanj codebase change on 'master' branch. the previous commit, did this codebase change on xalanj branch xalan-j_xslt3.0. 3a51a5ad changing project name within .project file on the master branch 356ce496 updating master branch, to have same contents as the branch xalan-j_2_7_1_maint 0affa12b clearing all the project contents from the xalanj master branch ff674397 Add SECURITY.md 222095d5 minor correction to XalanJ docs ``` Set up the "Master until 2023-10-17" tag. Confirm that Git Blame erroneously shows Mukul as author. Execute the master-reset. ``` keshlam@goldtooth xalan-java]$ git remote add stanio https://github.com/stanio/xalan-java.git [keshlam@goldtooth xalan-java]$ git fetch --all Fetching origin Fetching stanio remote: Enumerating objects: 25, done. remote: Counting objects: 100% (25/25), done. remote: Compressing objects: 100% (8/8), done. remote: Total 25 (delta 14), reused 25 (delta 14), pack-reused 0 Unpacking objects: 100% (25/25), 2.87 KiB | 489.00 KiB/s, done. From https://github.com/stanio/xalan-java * [new branch] master -> stanio/master * [new branch] xalanj-2671-master-reset -> stanio/xalanj-2671-master-reset * [new branch] xalanj-2671-restore-history -> stanio/xalanj-2671-restore-history [keshlam@goldtooth xalan-java]$ git checkout master Already on 'master' Your branch is up to date with 'origin/master'. [keshlam@goldtooth xalan-java]$ git reset --hard stanio/xalanj-2671-master-reset HEAD is now at 71a91c2d committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet. ``` Check blame: Looks good! Check log: ``` [keshlam@goldtooth xalan-java]$ git log --oneline | head -n 10 71a91c2d committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet. 144e8667 Revert default indent-amount 5645f26b increasing the default indent amount for the xalanj document serializer. this makes it little bit easier to view xalanj xslt transformation result. doing this xalanj codebase change on 'master' branch. the previous commit, did this codebase change on xalanj branch xalan-j_xslt3.0. 6d440bf7 changing project name within .project file on the master branch a055accd Add SECURITY.md f51fdd9e resetting state of the branch, appropriate for git clone. deleting certain java files, that are generated by the tools during build. 25b9c336 minor corrections to, linux build.sh file 28169adb minor changes to, xalanj build configuration 49873086 minor changes to, xalanj readme file 8762a120 minor changes to, xalanj readme file ``` Merge hashes have changed; odd but OK. Two commits seem to have vanished: ``` be0d250e committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet. 690bd044 Merge pull request #5 from jkesselm/master ``` But git diff says the only differences from head are: EOLs changed on LICENSE.txt, NOTICE.txt, createdb.sql, runDeby.bat, runXalan.bat, contact_us.xml about 75 files' Unix protection modes changed from 644 to 755 (execute bits set). A bit of quick cli hackery fixed those; git diff now reports match. Committed and forced push. Log is now: ``` acdb8998 XALANJ-2671: Change history recovered. A bit of postprocessing was required to repair execute permissions and newlines. 71a91c2d committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet. [etc]``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
