Discussion:
[Texmacs-dev] Multiple "git svn" mirrors of texmacs on github, problems...?
Karl Hegbloom
2017-10-06 21:59:32 UTC
Permalink
I'm fairly new with using git and github, and did not think of this
sooner... Both Darcy Shen (@sadhen) and I (@KarlHegbloom) have put mirrors
of the primary subversion repository---which is maintained by TeXmacs
primary author, Joris van der Hoeven---up on github, to facilitate patch
sharing, and to try and promote the use of git, perhaps.

The problem is that instead of there being one initial git repository that
was then cloned, we've each begun a separate repository, cloned via "git
svn", maintained via "git svn rebase" on the svn trunk "vendor tracking"
branch. And so when I add a git remote for sadhen-github and then fetch, it
tells me that there are no common commits!

Despite that, most of the file blobs are pretty much the same, I guess...
It did not really download as much data as I was afraid it would. Despite
that the git commit objects are not the same---they have different SHA1
because of something to do with how git svn works, I suppose---the file
blobs are the same from one svn version to the next and so the git file
blobs are also eq with identical SHA1 in both @sadhen and my github
repository.

I don't know that it really matters, since a git diff of my svn-trunk with
@sadhen's master---the names of the branches that track svn with no other
modifications---is an empty diff. So we can still work with this, I think.

Another benefit of having them clone from the same base git repository is
that then github keeps track of that, and links them more usefully, for the
pull-request functionality, etc.

If there is an official TeXmacs/texmacs.git available on github, then we
can clone from that. I wonder if the svn repo can be configured to
automatically cause a git svn rebase to happen, followed by a git push to
send it up to github? Or that could be running as a daily or twice daily
job on any computer that is always on... I wonder if github can
automatically keep a svn to git mirror up to date? I think Launchpad can,
but I'm not certain.

blah blah blah blah... :-)
--
***@gmail.com
Massimiliano Gubinelli
2017-10-07 17:16:02 UTC
Permalink
I maintained for a long time a git mirror for TeXmacs (search for mgubi at github), however it was configured quite naively and I’m not sure it is the best option. Maybe you guys should simply decide which of these repos is worth to elect as official git mirror and we can go along with that. I run a mirroring script once in a while. We should find out the best option to maintain a centralised mirror.

m
The problem is that instead of there being one initial git repository that was then cloned, we've each begun a separate repository, cloned via "git svn", maintained via "git svn rebase" on the svn trunk "vendor tracking" branch. And so when I add a git remote for sadhen-github and then fetch, it tells me that there are no common commits!
Another benefit of having them clone from the same base git repository is that then github keeps track of that, and links them more usefully, for the pull-request functionality, etc.
If there is an official TeXmacs/texmacs.git available on github, then we can clone from that. I wonder if the svn repo can be configured to automatically cause a git svn rebase to happen, followed by a git push to send it up to github? Or that could be running as a daily or twice daily job on any computer that is always on... I wonder if github can automatically keep a svn to git mirror up to date? I think Launchpad can, but I'm not certain.
blah blah blah blah... :-)
--
Texmacs-dev mailing list
https://lists.gnu.org/mailman/listinfo/texmacs-dev
Darcy Shen
2017-10-11 05:45:45 UTC
Permalink
## Reasons to adopt https://github.com/texmacs/texmacs
There are many TeXmacs mirrors on github using git-svn.


I sugguest that we should use https://github.com/texmacs/texmacs


There are several reasons:
1. I mirror it in a group named texmacs (I have invited vdhoeven to the group. And if accepted, I will transfer the ownership)
2. I'm running a cronjob for mirroring on my own server
3. I'm maintaining a svn commit user to github user mapping, see https://github.com/texmacs/texmacs/graphs/contributors


## Why I set up new TeXmacs repo on github?
I forked Karl's texmacs repo on github last year, and begin to make it build using CMake. I made it and Karl improved it later. However, these changes haven't been merged into the official SVN repo.


Why?


Please see this PR: https://github.com/KarlHegbloom/texmacs/pull/12


There are too many changes to apply it on the SVN code bases.


## Work Flow and Pull Request


The better work flow should be:
1. fork https://github.com/texmacs/texmacs
2. work on your branch based on the master (please **minimize** your changes and make it easier to merge)
3. create a PR on github
4. We will review the code and merge it into the SVN code base




For Karl:


You have made many improvements on TeXmacs. I suggest we should separate these changes into smaller PRs and merge it into SVN.


You may fork https://github.com/texmacs/texmacs into github.com/KarlHegbloom/TeXmacs



---- On Sat, 07 Oct 2017 05:59:32 +0800 Karl Hegbloom <***@gmail.com> wrote ----

I'm fairly new with using git and github, and did not think of this sooner... Both Darcy Shen (@sadhen) and I (@KarlHegbloom) have put mirrors of the primary subversion repository---which is maintained by TeXmacs primary author, Joris van der Hoeven---up on github, to facilitate patch sharing, and to try and promote the use of git, perhaps.

The problem is that instead of there being one initial git repository that was then cloned, we've each begun a separate repository, cloned via "git svn", maintained via "git svn rebase" on the svn trunk "vendor tracking" branch. And so when I add a git remote for sadhen-github and then fetch, it tells me that there are no common commits!


Despite that, most of the file blobs are pretty much the same, I guess... It did not really download as much data as I was afraid it would. Despite that the git commit objects are not the same---they have different SHA1 because of something to do with how git svn works, I suppose---the file blobs are the same from one svn version to the next and so the git file blobs are also eq with identical SHA1 in both @sadhen and my github repository.


I don't know that it really matters, since a git diff of my svn-trunk with @sadhen's master---the names of the branches that track svn with no other modifications---is an empty diff. So we can still work with this, I think.


Another benefit of having them clone from the same base git repository is that then github keeps track of that, and links them more usefully, for the pull-request functionality, etc.


If there is an official TeXmacs/texmacs.git available on github, then we can clone from that. I wonder if the svn repo can be configured to automatically cause a git svn rebase to happen, followed by a git push to send it up to github? Or that could be running as a daily or twice daily job on any computer that is always on... I wonder if github can automatically keep a svn to git mirror up to date? I think Launchpad can, but I'm not certain.


blah blah blah blah... :-)
--
***@gmail.com

_______________________________________________
Texmacs-dev mailing list
Texmacs-***@gnu.org
https://lists.gnu.org/mailman/listinfo/texmacs-dev
Karl Hegbloom
2017-10-11 15:57:45 UTC
Permalink
I won't argue about which repository at Github should be considered the
"base" one because the base repository is the svn repo that belongs to Mr.
Joris van der Hoeven. I think (nb:: I have not tried this yet; just saying
off-the-cuff) that by fetching after adding the git remote for the other
repository that rebasing onto the other repository's git svn trunk will be
an easy no-edits-required operation. I think I'll clone the other repo on
github, clone a local copy, then in there, add my other texmacs repo's
local filesystem copy as a git remote, fetch, checkout, then rebase. If
this fails, I'll have backups handy, just to be sure.

What is the issue regarding FSF / GNU and the use of Github? Is that going
to be problematic?
https://www.gnu.org/software/repo-criteria-evaluation.en.html
I say let's stick with Github. The underlying technology is still git. The
FSF's complaints about Github are not about git, but about them using
non-free JavaScript in their web interface... but to me that's not a real
problem nor a reason to not use the Github service.
Post by Darcy Shen
## Reasons to adopt https://github.com/texmacs/texmacs
There are many TeXmacs mirrors on github using git-svn.
I sugguest that we should use https://github.com/texmacs/texmacs
1. I mirror it in a group named texmacs (I have invited vdhoeven to the
group. And if accepted, I will transfer the ownership)
2. I'm running a cronjob for mirroring on my own server
3. I'm maintaining a svn commit user to github user mapping, see
https://github.com/texmacs/texmacs/graphs/contributors
## Why I set up new TeXmacs repo on github?
I forked Karl's texmacs repo on github last year, and begin to make it
build using CMake. I made it and Karl improved it later. However, these
changes haven't been merged into the official SVN repo.
Why?
Please see this PR: https://github.com/KarlHegbloom/texmacs/pull/12
There are too many changes to apply it on the SVN code bases.
## Work Flow and Pull Request
1. fork https://github.com/texmacs/texmacs
2. work on your branch based on the master (please **minimize** your
changes and make it easier to merge)
3. create a PR on github
4. We will review the code and merge it into the SVN code base
You have made many improvements on TeXmacs. I suggest we should separate
these changes into smaller PRs and merge it into SVN.
You may fork https://github.com/texmacs/texmacs into
github.com/KarlHegbloom/TeXmacs
---- On Sat, 07 Oct 2017 05:59:32 +0800 *Karl Hegbloom
I'm fairly new with using git and github, and did not think of this
of the primary subversion repository---which is maintained by TeXmacs
primary author, Joris van der Hoeven---up on github, to facilitate patch
sharing, and to try and promote the use of git, perhaps.
The problem is that instead of there being one initial git repository that
was then cloned, we've each begun a separate repository, cloned via "git
svn", maintained via "git svn rebase" on the svn trunk "vendor tracking"
branch. And so when I add a git remote for sadhen-github and then fetch, it
tells me that there are no common commits!
Despite that, most of the file blobs are pretty much the same, I guess...
It did not really download as much data as I was afraid it would. Despite
that the git commit objects are not the same---they have different SHA1
because of something to do with how git svn works, I suppose---the file
blobs are the same from one svn version to the next and so the git file
repository.
I don't know that it really matters, since a git diff of my svn-trunk with
@sadhen's master---the names of the branches that track svn with no other
modifications---is an empty diff. So we can still work with this, I think.
Another benefit of having them clone from the same base git repository is
that then github keeps track of that, and links them more usefully, for the
pull-request functionality, etc.
If there is an official TeXmacs/texmacs.git available on github, then we
can clone from that. I wonder if the svn repo can be configured to
automatically cause a git svn rebase to happen, followed by a git push to
send it up to github? Or that could be running as a daily or twice daily
job on any computer that is always on... I wonder if github can
automatically keep a svn to git mirror up to date? I think Launchpad can,
but I'm not certain.
blah blah blah blah... :-)
--
_______________________________________________
Texmacs-dev mailing list
https://lists.gnu.org/mailman/listinfo/texmacs-dev
_______________________________________________
Texmacs-dev mailing list
https://lists.gnu.org/mailman/listinfo/texmacs-dev
--
***@gmail.com
Zhaocong Jia
2017-10-13 01:13:25 UTC
Permalink
Hi Darcy Shen, it seems that you can commit to the official SVN repo?

Can you apply this typo fix patch in attachment? It's a minor update from
my post last month.

It seems that Mr. Joris van der Hoeven's last post to this mailing list is
in April 2014, I wonder what have happened.
Darcy Shen
2017-10-13 06:33:50 UTC
Permalink
Reviewed and applied.

I suggest you should use github to submit patches: https://github.com/texmacs/texmacs/wiki


For me, it is more friendly to review the changes.


Thanks!

---- On Fri, 13 Oct 2017 09:13:25 +0800 Zhaocong Jia<***@gmail.com> wrote ----

Hi Darcy Shen, it seems that you can commit to the official SVN repo?

Can you apply this typo fix patch in attachment? It's a minor update from
my post last month.

It seems that Mr. Joris van der Hoeven's last post to this mailing list is
in April 2014, I wonder what have happened.
_______________________________________________
Texmacs-dev mailing list
Texmacs-***@gnu.org
https://lists.gnu.org/mailman/listinfo/texmacs-dev
Darcy Shen
2017-10-13 12:11:43 UTC
Permalink
dailyI will adjust it.---- On Fri, 13 Oct 2017 18:03:03 +0800 Zhaocong Jia<***@gmail.com> wrote ----On Fri, Oct 13, 2017 at 2:33 PM, Darcy Shen <***@zoho.com> wrote: > Reviewed and applied. > > I suggest you should use github to submit patches: > https://github.com/texmacs/texmacs/wiki > > For me, it is more friendly to review the changes. > > Thanks! Thanks, may I ask how often does your cronjob run?
Darcy Shen
2017-10-21 11:02:21 UTC
Permalink
I have changed it.

Not the svn2git cronjob runs every 5 minutes.

---- On Fri, 13 Oct 2017 20:11:43 +0800 Darcy Shen &lt;***@zoho.com&gt; wrote ----


daily


I will adjust it.


---- On Fri, 13 Oct 2017 18:03:03 +0800 Zhaocong Jia&lt;***@gmail.com&gt; wrote ----


On Fri, Oct 13, 2017 at 2:33 PM, Darcy Shen &lt;***@zoho.com&gt; wrote:
&gt; Reviewed and applied.
&gt;
&gt; I suggest you should use github to submit patches:
&gt; https://github.com/texmacs/texmacs/wiki
&gt;
&gt; For me, it is more friendly to review the changes.
&gt;
&gt; Thanks!


Thanks, may I ask how often does your cronjob run?


_______________________________________________
Texmacs-dev mailing list
Texmacs-***@gnu.org
https://lists.gnu.org/mailman/listinfo/texmacs-dev

Loading...