test merge request " Update README #3" from github https://github.com/nordugrid/arc/pull/3
test merge request "Update README #3 (closed)" from github https://github.com/nordugrid/arc/pull/3
Link to github PR
https://github.com/nordugrid/arc/pull/3
Description
attempt to manually merge a PR from the github twin repository
I followed this procedure:
On my local copy of my fork of the gitlab nordugrid repo, I updated master from upstream as usual.
Then I did:
# 1. add github as a remote
$ git remote add github https://floridop@github.com/nordugrid/arc.git
# 2. Switch to master
$ git checkout master
# 3. Retrieve the pull request number from github, as in the URL: https://github.com/nordugrid/arc/pull/3
# the pr id is 3
# create a branch to contain the changes:
$ git fetch github pull/3/head:dev-github-pr3
From https://github.com/nordugrid/arc
* [new ref] refs/pull/3/head -> dev-github-pr3
# 4. move into the newly created branch
$ git checkout dev-github-pr3
Switched to branch 'dev-github-pr3'
# 5. merge the current master into the new branch
$ git merge master
Merge made by the 'recursive' strategy.
debian/copyright | 2 +-
po/ru.po | 2085 +++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
po/sv.po | 277 +++++++------
release_notes/release_notes_6.8.0 | 114 ++++++
release_notes/release_notes_6.8.1 | 108 +++++
src/clients/data/arccp.cpp | 2 +-
src/clients/data/arcls.cpp | 2 +-
src/clients/data/arcmkdir.cpp | 2 +-
src/clients/data/arcrename.cpp | 2 +-
src/clients/data/arcrm.cpp | 2 +-
src/doc/arc.conf.reference | 8 +
src/hed/dmc/file/DataPointFile.cpp | 2 +-
src/hed/dmc/file/DataPointFile.h | 2 +-
src/hed/dmc/gfal/DataPointGFAL.cpp | 3 +
src/hed/dmc/gfal/DataPointGFAL.h | 1 +
src/hed/dmc/gfal/DataPointGFALDelegate.cpp | 5 +
src/hed/dmc/gfal/DataPointGFALDelegate.h | 1 +
src/hed/dmc/gridftp/DataPointGridFTP.cpp | 2 +-
src/hed/dmc/gridftp/DataPointGridFTP.h | 2 +-
src/hed/dmc/gridftp/DataPointGridFTPDelegate.cpp | 8 +
src/hed/dmc/gridftp/DataPointGridFTPDelegate.h | 1 +
src/hed/dmc/gridftp/DataPointGridFTPHelper.cpp | 126 +++++-
src/hed/dmc/gridftp/DataPointGridFTPHelper.h | 5 +-
src/hed/dmc/http/DataPointHTTP.cpp | 21 +-
src/hed/dmc/http/DataPointHTTP.h | 3 +
src/hed/dmc/s3/DataPointS3.cpp | 2 +-
src/hed/dmc/s3/DataPointS3.h | 2 +-
src/hed/dmc/srm/DataPointSRM.cpp | 6 +
src/hed/dmc/srm/DataPointSRM.h | 1 +
src/hed/dmc/srm/srmclient/SRMClientRequest.h | 2 -
src/hed/libs/common/Run_unix.cpp | 4 +-
src/hed/libs/data/DataExternalComm.cpp | 27 ++
src/hed/libs/data/DataExternalComm.h | 40 +-
src/hed/libs/data/DataExternalHelper.cpp | 46 ++-
src/hed/libs/data/DataExternalHelper.h | 3 +
src/hed/libs/data/DataPoint.h | 2 +-
src/hed/libs/data/DataPointDelegate.cpp | 5 +-
src/hed/libs/data/DataPointDelegate.h | 2 +-
src/hed/libs/data/DataPointDirect.cpp | 2 +-
src/hed/libs/data/DataPointDirect.h | 2 +-
src/hed/libs/data/DataPointIndex.cpp | 2 +-
src/hed/libs/data/DataPointIndex.h | 2 +-
src/services/a-rex/grid-manager/arc-config-check | 12 +-
src/services/a-rex/grid-manager/run/RunRedirected.cpp | 2 +
src/services/a-rex/lrms/fork/submit-fork-job.in | 6 +-
src/services/a-rex/lrms/lrms_common.sh.in | 3 +-
src/services/a-rex/lrms/slurm/test/submit/basic-script.sh | 5 +-
src/services/a-rex/lrms/slurm/test/submit/config-options-test-multicore_scratch.patch | 9 +-
src/services/a-rex/lrms/slurm/test/submit/config-options-test-no_shared_filesystem.patch | 1 +
src/services/a-rex/lrms/slurm/test/submit/config-options-test-no_shared_filesystem_with_std_io.patch | 5 +-
src/services/a-rex/lrms/submit_common.sh | 5 +-
src/services/gridftpd/misc/ldapquery.cpp | 5 +-
src/services/gridftpd/misc/ldapquery.h | 4 +-
src/utils/python/arc/control/AccountingDB.py | 4 +-
54 files changed, 1693 insertions(+), 1304 deletions(-)
create mode 100644 release_notes/release_notes_6.8.0
create mode 100644 release_notes/release_notes_6.8.1
# 6. checked that the diffs where matching https://github.com/nordugrid/arc/pull/3/files
$ git diff master..dev-github-pr3
# 7. Pushed the branch to my origin as usual
$ git push origin dev-github-pr3
Password for 'https://floridop@source.coderefinery.org':
Counting objects: 5, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.16 KiB | 595.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote:
remote: To create a merge request for dev-github-pr3, visit:
remote: https://source.coderefinery.org/floridop/arc/-/merge_requests/new?merge_request%5Bsource_branch%5D=dev-github-pr3
remote:
To https://source.coderefinery.org/floridop/arc.git
* [new branch] dev-github-pr3 -> dev-github-pr3Then I submitted this pull request. I think the last part of the process is to review the pull request on github after the master on gitlab is synched with the one on github.
I am not sure this is the best workflow but I assume the master on github should always contain the latest version.
I wonder if we should also have a label for these.
FYI @dcameron