Is it possible to manage multiple repositories coherently?

天大地大妈咪最大 提交于 2019-12-30 06:01:32

问题


I have a collection of git repositories that are independently versioned but related to one another. For example, when adding a feature I may have to add functionality to a shared library, and then extend an application or service to take advantage of that functionality.

Currently, I would have to create a branch on each of the repositories that I touch while working on that feature. What I would like to do, however, is to simplify the process by branching and merging those multiple repositories at once (to reduce the likelihood of forgetting to branch, or committing/merging in one repository but not another).

Is there a simple way to branch and merge multiple repositories at once, or is this a task better suited for a collection of helper scripts? If the latter, are there any scripts available that already accomplish this?


回答1:


There isn't a built-in way to deal with multiple repositories at once, and if you think about the distributed nature of git, there really isn't anything but social convention that can define that. (Consider, what if someone pulls from you in one repository, but another remote for the second - can you have this coherence?)

You might find a tool like mr, which works with multiple repositories at the same time, helpful.

If you really have things that are tied that tightly, though, I would advise you to put them into one repository. That way you can't forget any of the steps, because they happen in one atomic operation.

If your code isn't actually that tightly tied together, though, then give up the "must branch at exactly the same time" notion and you will be happier.




回答2:


You can use the repo tool: https://gerrit.googlesource.com/git-repo/

  • set the same branch on multiple projects
  • view state of multiple repositories (branches, unmerged commits) with one command
  • manage a set of repositories (clone, sync, etc) with manifest files
  • lots of other cool stuff



回答3:


Also, take a look at: http://fabioz.github.io/mu-repo/ -- it's a tool such as mr and repo as I couldn't get those to work as I needed :)

Some notes:

  • it's done in Python (so, works well in any OS where Python runs: Linux, Win, Mac...)

  • besides running common git operations against many repos at once also provides workflows to:

    • clone multiple repositories
    • open urls from repos (so, it's possible to do create pull requests for multiple repos at once).
    • diff changes on multiple repos at once with winmerge or meld
    • execute non-git commands



回答4:


Just as an idea. I haven't tried this by myself, but I came across this feature some time ago. Try to add all the wanted repositories as submodule to a new "root" repository and use the following command

git submodule foreach --recursive <command>

You may consult the help for this and how to deal with submodules. You can use whatever command you want. git and non-git commands.




回答5:


The Android repo tool manages the creation of feature branches across multiple repositories. However the repo upload command can only publish to Gerrit code review.

If you use an ordinary Git repository manager like GitHub or GitLab, repo upload will not work; you need the nonexistent repo push command. I implemented repo push in the Wave Computing fork of repo. We use it in production.



来源:https://stackoverflow.com/questions/9136085/is-it-possible-to-manage-multiple-repositories-coherently

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!