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

[DOC] Update README #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,27 @@ Create a ``repos.yaml`` or ``repos.yml`` file:
fetch_all:
- oca

./gitlab-repo-example:
remotes:
gitlab_1: https://giltab.com/sample-org/sample-repo.git
gitlab_2: https://giltab.com/another-sample-org/sample-repo-fork.git
merges:
- gitlab_1 main
- gitlab_2 merge-requests/123/head
target: gitlab_1

# FYI: Bitbucket doesn't support fetching PR's
./bitbucket-repo-example:
remotes:
bitbucket_1: https://bitbucket.org/sample-org/sample-repo.git
bitbucket_2: https://bitbucker.org/another-sample-org/sample-repo-fork.git
merges:
- bitbucket_1 main
- bitbucket_2 dev
target: bitbucket_1



Environment variables inside of this file will be expanded if the proper option is selected.

All the ``merges`` are combined into a single branch. By default this branch is called ``_git_aggregated`` but another name may be given in the ``target`` section.
Expand Down Expand Up @@ -107,6 +128,38 @@ the ``dict`` alternate construction. If you need to disable a default in
ref: refs/pull/14859/head
target: acsone 9.0

./gitlab-repo-example:
defaults:
depth: 20
remotes:
gitlab_1: https://giltab.com/sample-org/sample-repo.git
gitlab_2: https://giltab.com/another-sample-org/sample-repo-fork.git
merges:
-
remote: gitlab_1
ref: main
depth: 20
-
remote: gitlab_2
ref: merge-requests/123/head
target: gitlab_1

# FYI: Bitbucket doesn't support fetching PR's
./bitbucket-repo-example:
remotes:
bitbucket_1: https://bitbucket.org/sample-org/sample-repo.git
bitbucket_2: https://bitbucker.org/another-sample-org/sample-repo-fork.git
merges:
-
remote: bitbucket_1
ref: main
depth: 3
-
remote: bitbucket_2
ref: dev
target: bitbucket_1


Remember that you need to fetch at least the common ancestor of all merges for
it to succeed.

Expand Down
Loading