Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review diffs between rel-10_0 and rel-10_1 #1033

Closed
bschmalhofer opened this issue May 27, 2021 · 2 comments
Closed

Review diffs between rel-10_0 and rel-10_1 #1033

bschmalhofer opened this issue May 27, 2021 · 2 comments
Assignees
@bschmalhofer @svenoe
Labels
tidying Tidying of the code
Milestone
OTOBO 10.0.13

Comments

@bschmalhofer
Copy link
Contributor

bschmalhofer commented May 27, 2021 •
edited
Loading

I think it is worthwhile to take a look at the diffs between rel-10_0 and rel-10_1. There are two benefits:

  • reduce the code drift, reduce diffs that have no consequences, like code comments and spelling corrections
  • maybe identify errors

New and deleted files can be skipped for this review: git checkout rel-10_0; git diff rel-10_1 --diff-filter=M > diff.out
@bschmalhofer bschmalhofer added the tidying Tidying of the code label May 27, 2021
@bschmalhofer bschmalhofer added this to the OTOBO 10.0 milestone May 27, 2021
@bschmalhofer bschmalhofer self-assigned this May 27, 2021
@bschmalhofer
Copy link
Contributor Author

Did a first round of looking thru the diffs. Pulled a few comment changes and a few refactorings from rel-10_1 to rel-10_0. Also pulled the support for the git-* files in the Docker image back into rel-10_0. This is expected to not break anything.

bschmalhofer added a commit that referenced this issue Jul 13, 2021
@bschmalhofer
Issue #1033: add support for the git-*.txt files in rel-10_0
c96c973 
It is sometimes useful to have that info in the output of the test suite.
The output file name that includes the branch is nice too.
bschmalhofer added a commit that referenced this issue Jul 13, 2021
@bschmalhofer
Issue #1033: pull some code comments and POD from rel-10.1
b061210
bschmalhofer added a commit that referenced this issue Jul 13, 2021
@bschmalhofer
Issue #1033: pull description of HttpType from rel-10_1
0674fc0
bschmalhofer added a commit that referenced this issue Jul 13, 2021
@bschmalhofer
Issue #1033: pull some slight code tidyings from rel-10_1
1a11b42
bschmalhofer added a commit that referenced this issue Jul 13, 2021
@bschmalhofer
Merge pull request #1130 from RotherOSS/issue-#1033-code_drift
0cc3d82 
Issue #1033 code drift
@bschmalhofer bschmalhofer mentioned this issue Aug 27, 2021
Closed
bschmalhofer added a commit that referenced this issue Aug 27, 2021
@bschmalhofer
Issue #1033: remove ConfigXMLStructure.pm
41ea1af 
That module already has been removed in rel-10_0. See #534.
For some reason it was not removed when rel-10_0 and rel-10_1 were synced.
bschmalhofer added a commit that referenced this issue Aug 27, 2021
@bschmalhofer
Merge pull request #1199 from RotherOSS/issue-#1033-review_diffs
b9318e6 
Issue #1033: remove ConfigXMLStructure.pm
@bschmalhofer
Copy link
Contributor Author

Inspected the diffs again and found nothing spectecular. Removed the file Kernel/System/Console/Command/Dev/Tools/Migrate/ConfigXMLStructure.pm in rel-10_1 as it is already gone in rel-10_0. No idea why the deletion wasn't merged into rel-10_1 before. Noticed again that annotating commits with an issue is really helpful.

I don't think that checking the complete diffs again is worth it, therefore closing this issue.

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

@bschmalhofer bschmalhofer

@svenoe svenoe

Labels
tidying Tidying of the code
Projects
None yet
Milestone
OTOBO 10.0.13
Development

No branches or pull requests
2 participants
@bschmalhofer @svenoe