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.

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

Tracking issue for merging dm and ticdc repos #3194

Closed
7 of 10 tasks
Rustin170506 opened this issue Oct 29, 2021 · 5 comments
Closed
7 of 10 tasks

Tracking issue for merging dm and ticdc repos #3194

Rustin170506 opened this issue Oct 29, 2021 · 5 comments
Labels
area/dm Issues or PRs related to DM. area/ticdc Issues or PRs related to TiCDC. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. type/enhancement The issue or PR belongs to an enhancement.

Comments

@Rustin170506
Copy link
Member

Rustin170506 commented Oct 29, 2021

@Rustin170506 Rustin170506 changed the title Tracking issue for merging dm and ticdc codes dm and ticdc codesging Tracking issue for merging dm and ticdc codes Oct 29, 2021
@Rustin170506
Copy link
Member Author

How to cherry-pick the specific commit<COMMIT_SHA> to DM repo?

  • if the <COMMIT_SHA> not in <SPLIT_BRANCH>:
    • In TiCDC repo:
      • git subtree split --prefix=dm -b <SPLIT_BRANCH>
      • git checkout <SPLIT_BRANCH>
      • git push <DM_REPO_REMOTE>
      • <COMMIT_SHA>:refs/heads/<SPLIT_BRANCH>
  • In DM repo:
    • git fetch origin <SPLIT_BRANCH>
    • git checkout master
    • git checkout -b <pick_from_ticdc>
    • git cherry-pick <COMMIT_SHA>
  • Give a PR of merge <pick_from_ticdc> to master.

@Rustin170506 Rustin170506 added the help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. label Oct 29, 2021
@Rustin170506 Rustin170506 pinned this issue Oct 29, 2021
@sleepymole
Copy link
Contributor

We also need to integrate the DM code structure into the root project structure, rather than always as a sub directory.

@Rustin170506
Copy link
Member Author

We also need to integrate the DM code structure into the root project structure, rather than always as a sub directory.

Having adjusted the third TODO item description, we do need to work towards a standard structure!

@Rustin170506 Rustin170506 added area/dm Issues or PRs related to DM. area/ticdc Issues or PRs related to TiCDC. labels Nov 5, 2021
@Rustin170506 Rustin170506 changed the title Tracking issue for merging dm and ticdc codes Tracking issue for merging dm and ticdc repos Nov 5, 2021
@Ehco1996
Copy link
Contributor

how about merge dm/pkg/xx to pkg/xx ?

@lonng
Copy link
Contributor

lonng commented Dec 18, 2021

how about merge dm/pkg/xx to pkg/xx ?

Make sense

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dm Issues or PRs related to DM. area/ticdc Issues or PRs related to TiCDC. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

No branches or pull requests

5 participants