[bug]: fix encoding issue from automatic svn import #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When poking through my old OpenWRT code when cleaning up in 2025, I noticed there are two published chaoscalmer repositories. e6fbf31 git://git.archive.openwrt.org/15.05/openwrt.git:master 5c2685a7a3 git://git.openwrt.org/openwrt/svn-archive/archive.git:chaos_calmer The latest commits in git.archive.openwrt.org were in September 2016 and were svn imports. The svn-archive repo on git.openwrt.org had true git commits on top of the svn imports until the end of 2017. The two branches do not share a common commit for an easy rebase. Neither branch was strictly superior to the other. e6fbf31 older, missing valuable commits 5c2685a7a3 encoding issues f9755e2 from the newer repo was identified as being close to the tip of the older one (essentially only missing commit 29fcc94). This commit here is then basically the result of commit the result of git checkout e6fbf31 -b wip.chaoscalmer git diff f9755e2 5c2685a7a3 -- package/kernel/ | git apply - git commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When poking through my old OpenWRT code when cleaning up in 2025, I noticed there are two published chaoscalmer repositories.
e6fbf31 git://git.archive.openwrt.org/15.05/openwrt.git:master
5c2685a7a3 git://git.openwrt.org/openwrt/svn-archive/archive.git:chaos_calmer
The latest commits in git.archive.openwrt.org were in September 2016 and were svn imports. The svn-archive repo on git.openwrt.org had true git commits on top of the svn imports until the end of 2017. The two branches do not share a common commit for an easy rebase. Neither branch was strictly superior to the other.
e6fbf31 older, missing valuable commits
5c2685a7a3 encoding issues
f9755e2 from the newer repo was identified as being close to the tip of the older one (essentially only missing commit 29fcc94). This commit here is then basically the result of commit the result of
git checkout e6fbf31 -b wip.chaoscalmer
git diff f9755e2 5c2685a7a3 -- package/kernel/ | git apply - git commit