Re: Pan repository on Gitlab / manual sync

Am 28.10.19 um 19:18 schrieb Petr Kovar:

> On Mon, 28 Oct 2019 17:40:16 +0100
> Detlef Graef <[email protected]> wrote:
> 
>> I want to keep my fork of Pan on Gitlab
>> (https://gitlab.gnome.org/GNOME/pan) in sync with the upstream
>> repository. But I don't know how to do this. I prefer a manual sync, but
>> mirroring would also be ok.
> 
> I'd say the best way is to set remotes for upstream and your fork in your
> clone:
> 
> git remote add upstream [email protected]:GNOME/pan.git
> git remote add dgraef [email protected]:dgraef/pan.git
> 
> Then just create a new branch from upstream origin and push to your fork:
> 
> git checkout upstream/master
> git checkout -b newbranch
> git push dgraef newbranch
> 
> It's better to keep creating new branches rather than trying to keep your
> fork's master branch in sync, I think.

My idea for the workflow was this:
(use monospaced font)

+--------------------------------------------+
|  repo: https://gitlab.gnome.org/GNOME/pan  |
+--------------------------------------------+
   |                                    ^
   | 1. fork via GUI and keep in sync   |
   |                                    | Merge requests
   V                                    |
+---------------------------------------------+
|  repo: https://gitlab.gnome.org/dgraef/pan  |
+---------------------------------------------+
   |                             ^
   | 1. "git clone" and "pull"   |
   |                             | git push
   V                             |
+---------------------------------------------+
|            repo: on my local PC             |
+---------------------------------------------+



The upstream repo for my local repo is: https://gitlab.gnome.org/dgraef/pan

I will add as a second upstream repo: https://gitlab.gnome.org/GNOME/pan

I will try something like this:

                          merge requests
+----------------------------+    +-----------------------------+
| gitlab.gnome.org/GNOME/pan |<---| gitlab.gnome.org/dgraef/pan |
+----------------------------+    +-----------------------------+
              |                           ^
              | git pull                  | git push
              V                           |
         +---------------------------------------------+
         |            repo: on my local PC             |
         +---------------------------------------------+


I will keep my repo https://gitlab.gnome.org/dgraef/pan in sync via my
local repo. I will try to keep in sync with master branch. (I want to
avoid a new branch)

I want that a merge request can be merged easy, so my repo has to be in
sync.


Detlef

_______________________________________________
Pan-users mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/pan-users