Hi Ted,

great to see people join us on gitlab :)

Is the 0.92.x branch this one: https://gitlab.com/inkscape/inkscape/tree/inkscape.board_0.92.x/po ?

(should it be renamed?)

Kind Regards, Maren

Am 09.06.2017 um 20:40 schrieb Jabier Arraiza:

Thanks Ted!!!

On Fri, 2017-06-09 at 14:17 -0400, Martin Owens wrote:

...

Thanks Ted!

This is super work, 1.5GB of awesome.

As discussed, I've updated the website documentation for developers:

https://inkscape.org/en/develop/getting-started/ https://inkscape.org/en/develop/inkscape-git/

There've been basically upgraded to point to git, but I can see a need for some drafting and also there's a whole section on windows development that talks about inkscape-devlibs that I have no clue on. So that should be picked up by a windows dev at some point.

Best Regards, Martin Owens

On Fri, 2017-06-09 at 11:29 -0500, Ted Gould via Inkscape-devel wrote:

...

Hello all,

There seems to be a good Git repository on Gitlab now:

https://gitlab.com/inkscape/inkscape

I think there's still work to do in making the branch names, for releases especially, consistent. And there are probably many that can be deleted. But folks should be able to get back to work using that Git repository.

A reminder to folk that we have a guide in the Wiki, and I found a Gitlab cheat sheet on Git as well. Please ask on the mailing list or in #inkscape-devel if you have issues.

http://wiki.inkscape.org/wiki/index.php/Working_with_Git https://about.gitlab.com/images/press/git-cheat-sheet.pdf

Thanks everyone, Ted

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot

---

Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

On Fri, Jun 09, 2017 at 04:10:39PM -0300, Felipe Sanches wrote:

I suggest we start using git tags for each release. A branch names describes a series of commits diverging from the main (master) branch. A git tag specifies a single commit (such as the exact commit that contains the source code in the state it was when a release happened).

Of course. Actually tagging releases has been part of the process for quite some time (see `bzr tags`), no reason not to continue doing so with git.

It looks like many of the bzr tags transferred over to git (see `git tag`) although I notice a lot are missing - it looks like it only pulled tags associated with a revno or something. Fortunately, it's easy to retroactively add git tags; if anyone would like to fix them up please do so. Notably, we need the tags for INKSCAPE_0_92_0, INKSCAPE_0_92_1, INKSCAPE_0_48_1, and INKSCAPE_0_48_2. The other *_PREx tags would be nice for historical purposes, but of low importance.

The release docs in wiki describe how we've been doing the bzr tagging; if anyone wishes to update them for git, please do. Otherwise, I'll tackle it for the next release.

Bryce

2017-06-09 16:03 GMT-03:00 Maren Hachmann <maren@...3165...>:

...

Hi Ted,

great to see people join us on gitlab :)

Is the 0.92.x branch this one: https://gitlab.com/inkscape/inkscape/tree/inkscape.board_0.92.x/po ?

(should it be renamed?)

Kind Regards, Maren

Am 09.06.2017 um 20:40 schrieb Jabier Arraiza:

...

Thanks Ted!!!

On Fri, 2017-06-09 at 14:17 -0400, Martin Owens wrote:

...

Thanks Ted!

This is super work, 1.5GB of awesome.

As discussed, I've updated the website documentation for developers:

https://inkscape.org/en/develop/getting-started/ https://inkscape.org/en/develop/inkscape-git/

There've been basically upgraded to point to git, but I can see a need for some drafting and also there's a whole section on windows development that talks about inkscape-devlibs that I have no clue on. So that should be picked up by a windows dev at some point.

Best Regards, Martin Owens

On Fri, 2017-06-09 at 11:29 -0500, Ted Gould via Inkscape-devel wrote:

...

Hello all,

There seems to be a good Git repository on Gitlab now:

https://gitlab.com/inkscape/inkscape

I think there's still work to do in making the branch names, for releases especially, consistent. And there are probably many that can be deleted. But folks should be able to get back to work using that Git repository.

A reminder to folk that we have a guide in the Wiki, and I found a Gitlab cheat sheet on Git as well. Please ask on the mailing list or in #inkscape-devel if you have issues.

http://wiki.inkscape.org/wiki/index.php/Working_with_Git https://about.gitlab.com/images/press/git-cheat-sheet.pdf

Thanks everyone, Ted

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

---

...

...

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot

---

Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot

---

Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

I'd like to ask for commit write access on the git repo. I've been inactive during the past several years, but I recently started working on implementing OpenType Variable Fonts support, so I'd like to make sure I still have write access on the new git repo (just like I had on bzr).

My account on gitlab is https://gitlab.com/fsanches

cheers, Felipe "Juca" Sanches

On Sat, Jun 10, 2017 at 02:30:56PM +0200, Eduard Braun wrote:

Hi all,

after the GitLab migration there's obviously a lot to do!

I'm already starting to loose track of everything so I created a list on the Wiki: http://wiki.inkscape.org/wiki/index.php/Talk:Working_with_Git#TODO_list _after_the_GitLab_Migration

Cool, thanks for putting that together. Also don't be afraid to move some of those items into the bug tracker, particularly if they're longer range items or need to be tracked with assignees and discussion and so on. (i.e. some of the stuff in the last half of the list probably need owned by me as we'll need to coordinate finding a consensus decision on what to do.)

Feel free to add and modify things as required and give feedback (might make sense not to discuss everything in the same thread, though, especially for the discussion-heavy points like commit policy). Also remember that we do not need to solve everything right away!

I'm going to concentrate on the more technical points first and started with looking into continouous builds on Windows! If you start to work on one of the things you might want to put down your name in the list so there are no collisions.

Thank you very much again for taking on the migration Ted!

There's also some cmake work which I'd put off with the original cmake migration, to do after the git migration was done; see the cmake todo list. I plan on digging into some of that in a week or so.

We also discussed some changes to wiki that were postponed until post-gitlab migration, so those are also now bubbled up. But they're not super urgent so can wait until some of this other stuff gets tackled.

Bryce

Hi Eduard,

So the timeline goes like this:

2003, inscape on svn (I think it was svn) 2006, inkscape moves to bzr, you can see revision 1 on the bzr branch is MentalGuy 2006, which is what you can see I think in the git repository.

If you can see 2003 commits, that means ted brought in older commits from before bzr, which is impressive.

Will flattening the branch cause hashes to be re-generated?

Best Regards, Martin Owens

On Mon, 2017-06-12 at 05:25 +0200, Eduard Braun wrote:

While the first commit of our git import of trunk is dated 2006-01-16 and therefore starts ~3 years late older history is not lost! I found that 0.45.x/0.46.x branches include commit history going back until 2003-10-30 [1] (I guess this is the very start of it all?!).

On Mon, Jun 12, 2017 at 05:25:15AM +0200, Eduard Braun wrote:

Hi all,

just a quick note which might be interesting for some of the "historians" among us:

While the first commit of our git import of trunk is dated 2006-01-16 and therefore starts ~3 years late older history is not lost! I found that 0.45.x/0.46.x branches include commit history going back until 2003-10-30 [1] (I guess this is the very start of it all?!).

Slick, nice. Yes that looks like the very start of work on Inkscape, when it was just the four founders:

https://gitlab.com/inkscape/inkscape/network/master?utf8=%E2%9C%93&exten...

The history does go back further, but you'd need to jump to the Sodipodi svn history at this point. If you go all the way back, it originates as a program named Gill:

http://www.levien.com/svg/

With git it's even possible to stitch the two histories together! I described the necessary step (it's just one command!) at [2] which allows to achieve a continouous ancestry for all our release branches going back to this very first commit.

Best Regards and happy digging, Eduard

[1] https://gitlab.com/inkscape/inkscape/commit/9ed8de136577ccaaae3289dd416 5171573c7bcbc [2] http://wiki.inkscape.org/wiki/index.php/Talk:Working_with_Git#Get_full_ commit_history

Gesendet: Freitag, 09. Juni 2017 um 18:29 Uhr Von: "Ted Gould via Inkscape-devel" inkscape-devel@lists.sourceforge.net An: "Inkscape Devel List" inkscape-devel@lists.sourceforge.net Betreff: [Inkscape-devel] [Gitlab Migration] DONE Hello all, There seems to be a good Git repository on Gitlab now: [1]https://gitlab.com/inkscape/inkscape I think there's still work to do in making the branch names, for releases especially, consistent. And there are probably many that can be deleted. But folks should be able to get back to work using that Git repository. A reminder to folk that we have a guide in the Wiki, and I found a Gitlab cheat sheet on Git as well. Please ask on the mailing list or in #inkscape-devel if you have issues. [2]http://wiki.inkscape.org/wiki/index.php/Working_with_Git [3]https://about.gitlab.com/images/press/git-cheat-sheet.pdf Thanks everyone, Ted

---

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! [4]http://sdm.link/slashdot____________________________________________ ___ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net [5]https://lists.sourceforge.net/lists/listinfo/inkscape-devel

References

1. https://gitlab.com/inkscape/inkscape
2. http://wiki.inkscape.org/wiki/index.php/Working_with_Git
3. https://about.gitlab.com/images/press/git-cheat-sheet.pdf
4. http://sdm.link/slashdot_______________________________________________
5. https://lists.sourceforge.net/lists/listinfo/inkscape-devel

---

Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot

---

Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel