Talk:Working with Git - Revision history

Patrick87: /* TODO list after the GitLab Migration */ two more done (some might still be worth looking into, especially policy-wise)

2018-01-15T19:35:50Z

TODO list after the GitLab Migration: two more done (some might still be worth looking into, especially policy-wise)

← Older revision		Revision as of 19:35, 15 January 2018
Line 5:		Line 5:
	* <s>Update build for git</s> ([https://gitlab.com/inkscape/inkscape/commit/7811297f0ad86acaad0477096dd919f51e18b3e7 done]) [Mc]<br/><s>code compiles fine already but in some places we depended on bzr (notably for getting revno)</s>		* <s>Update build for git</s> ([https://gitlab.com/inkscape/inkscape/commit/7811297f0ad86acaad0477096dd919f51e18b3e7 done]) [Mc]<br/><s>code compiles fine already but in some places we depended on bzr (notably for getting revno)</s>
	* Clean-up branches		* Clean-up branches
	** Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)		** <s>Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)</s> (done)
	*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).		*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).
	** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:		** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:
Line 13:		Line 13:
	*** Delete branches that are not needed anymore. (For example I realized branches of rejected merge requests were exported, too; I assume it's fine to get rid of them?)		*** Delete branches that are not needed anymore. (For example I realized branches of rejected merge requests were exported, too; I assume it's fine to get rid of them?)
	*** In the long run: Decide whether to move those branches to another repo for safekeeping. I suggest we aim at only having release branches under [https://gitlab.com/inkscape/inkscape inkscape/inkscape] while feature branches of developers should reside in personal forks		*** In the long run: Decide whether to move those branches to another repo for safekeeping. I suggest we aim at only having release branches under [https://gitlab.com/inkscape/inkscape inkscape/inkscape] while feature branches of developers should reside in personal forks
	*** [https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository		*** <s>[https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository</s> ([https://gitlab.com/inkscape/inkscape-infra/credentials/ done])
	* Re-add tags for past releases (some were lost during the migration)		* Re-add tags for past releases (some were lost during the migration)
	* <s>Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.</s>		* <s>Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.</s>

Patrick87: /* TODO list after the GitLab Migration */ mark done work (still some stuff on this list...)

2017-07-21T09:55:15Z

TODO list after the GitLab Migration: mark done work (still some stuff on this list...)

← Older revision		Revision as of 09:55, 21 July 2017
Line 3:		Line 3:
	(feel free to modify and expand, [[User:Eduard\|Eduard]] ([[User talk:Eduard\|talk]]))		(feel free to modify and expand, [[User:Eduard\|Eduard]] ([[User talk:Eduard\|talk]]))

	* Update build for git [Mc?]<br/>code compiles fine already but in some places we depended on bzr (notably for getting revno)		* <s>Update build for git</s> ([https://gitlab.com/inkscape/inkscape/commit/7811297f0ad86acaad0477096dd919f51e18b3e7 done]) [Mc]<br/><s>code compiles fine already but in some places we depended on bzr (notably for getting revno)</s>
	* Clean-up branches		* Clean-up branches
	** Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)		** Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)
Line 15:		Line 15:
	*** [https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository		*** [https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository
	* Re-add tags for past releases (some were lost during the migration)		* Re-add tags for past releases (some were lost during the migration)
	* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.		* <s>Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.</s>
	** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]		** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
	** <s>macOS: CI via GitLabCI with runner hosted on VM</s> (done: [https://gitlab.com/inkscape/inkscape/commit/ba8c21889ef78e7672444127b99cc04c129be37c 1] [https://gitlab.com/inkscape/inkscape/commit/6984b49a745784627f3b1ee3bb3c1b1513b37e77 2]) [tghs]		** <s>macOS: CI via GitLabCI with runner hosted on VM</s> (done: [https://gitlab.com/inkscape/inkscape/commit/ba8c21889ef78e7672444127b99cc04c129be37c 1] [https://gitlab.com/inkscape/inkscape/commit/6984b49a745784627f3b1ee3bb3c1b1513b37e77 2]) [tghs]

Tghs: Mac CI done

2017-07-02T17:27:10Z

Mac CI done

← Older revision		Revision as of 17:27, 2 July 2017
Line 17:		Line 17:
	* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.		* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.
	** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]		** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
	** macOS: CI via GitLabCI with runner hosted on VM [tghs]		** <s>macOS: CI via GitLabCI with runner hosted on VM</s> (done: [https://gitlab.com/inkscape/inkscape/commit/ba8c21889ef78e7672444127b99cc04c129be37c 1] [https://gitlab.com/inkscape/inkscape/commit/6984b49a745784627f3b1ee3bb3c1b1513b37e77 2]) [tghs]
	** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]		** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]
	* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:		* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:

Tghs: Add note on macOS CI WIP implementation

2017-06-16T10:49:45Z

Add note on macOS CI WIP implementation

← Older revision		Revision as of 10:49, 16 June 2017
Line 17:		Line 17:
	* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.		* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.
	** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]		** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
	** macOS: [tghs]		** macOS: CI via GitLabCI with runner hosted on VM [tghs]
	** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]		** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]
	* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:		* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:

Patrick87: /* TODO list after the GitLab Migration */ clarify

2017-06-14T17:48:36Z

TODO list after the GitLab Migration: clarify

Patrick87: /* TODO list after the GitLab Migration */ fast-forward merges broken?

2017-06-14T12:19:26Z

TODO list after the GitLab Migration: fast-forward merges broken?

← Older revision		Revision as of 12:19, 14 June 2017
Line 25:		Line 25:
	* Finalize set-up of GitLab repo		* Finalize set-up of GitLab repo
	** The previous bullet point will decide some settings regarding repo access		** The previous bullet point will decide some settings regarding repo access
	** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce)		** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce)<br>Might need reverting as it seems there's no "Rebase" functionality on GitLab.com making it impossible to merge most MEs automatically (the setting [https://docs.gitlab.com/ee/workflow/rebase_before_merge.html] seems to be missing)
	** <s>PRs are non-public right now</s> (seems already fixed)		** <s>PRs are non-public right now</s> (seems already fixed)
	** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)		** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)

Patrick87: /* TODO list after the GitLab Migration */ CI on Linux and Windows done

2017-06-14T12:15:20Z

TODO list after the GitLab Migration: CI on Linux and Windows done

← Older revision		Revision as of 12:15, 14 June 2017
Line 16:		Line 16:
	* Re-add tags for past releases (some were lost during the migration)		* Re-add tags for past releases (some were lost during the migration)
	* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.		* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.
	** Linux:		** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
	** macOS: [tghs]		** macOS: [tghs]
	** Windows: CI via Appveyor and MSYS2 [https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 ~~prepared~~] [Eduard]~~, needs authorization by GitLab user with "owner" permissions.~~		** <s>Windows: CI via Appveyor and MSYS2</s> [https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done] [Eduard]
	* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:		* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:
	** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.		** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.

Patrick87: /* Questions/Confusions */ "git branch -r" shows remote branches (that's the '-r' switch)

2017-06-12T11:28:26Z

Questions/Confusions: "git branch -r" shows remote branches (that's the '-r' switch)

← Older revision		Revision as of 11:28, 12 June 2017
Line 34:		Line 34:
	== Questions/Confusions ==		== Questions/Confusions ==

	* How does one get a list of branches?<br/>'''Answer:''' <code>git branch -r</code> if branches ~~are~~ local.		* How does one get a list of branches?<br/>'''Answer:''' <code>git branch</code> lists local branches, <code>git branch -r</code> lists all branches (local and from all remotes).
	* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?<br/>'''Answer:''' See frontpage, [[Working with Git#Checkout multiple branches into different folders]]		* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?<br/>'''Answer:''' See frontpage, [[Working with Git#Checkout multiple branches into different folders]]
	* Should it be 'origin/0.92.x' rather than '0.92.x'?<br/>'''Answer:''' 'origin/0.92.x' references the branch '0.92.x' in the remote called 'origin' (typically this is the repository that you initially cloned). The locally checked out branch is referred to by plain '0.92.x'. You can other remotes (e.g. 'upstream') and reference those as 'upstream/0.92.x'		* Should it be 'origin/0.92.x' rather than '0.92.x'?<br/>'''Answer:''' 'origin/0.92.x' references the branch '0.92.x' in the remote called 'origin' (typically this is the repository that you initially cloned). The locally checked out branch is referred to by plain '0.92.x'. You can other remotes (e.g. 'upstream') and reference those as 'upstream/0.92.x'

Patrick87: /* Questions/Confusions */ hopefully answer some questions, resolve some confusion

2017-06-12T11:25:31Z

Questions/Confusions: hopefully answer some questions, resolve some confusion

← Older revision		Revision as of 11:25, 12 June 2017
Line 34:		Line 34:
	== Questions/Confusions ==		== Questions/Confusions ==

	* How does one get a list of branches? Answer: 'git branch -r' if branches are local.		* How does one get a list of branches?<br/>'''Answer:''' <code>git branch -r</code> if branches are local.
	* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?		* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?<br/>'''Answer:''' See frontpage, [[Working with Git#Checkout multiple branches into different folders]]
	* Should it be 'origin/0.92.x' rather than '0.92.x'?		* Should it be 'origin/0.92.x' rather than '0.92.x'?<br/>'''Answer:''' 'origin/0.92.x' references the branch '0.92.x' in the remote called 'origin' (typically this is the repository that you initially cloned). The locally checked out branch is referred to by plain '0.92.x'. You can other remotes (e.g. 'upstream') and reference those as 'upstream/0.92.x'

	== Get full commit history ==		== Get full commit history ==

Tavmjong: /* Questions/Confusions */

2017-06-12T09:23:13Z

Questions/Confusions

← Older revision		Revision as of 09:23, 12 June 2017
Line 34:		Line 34:
	== Questions/Confusions ==		== Questions/Confusions ==

	* How does one get a ~~liat~~ of branches?		* How does one get a list of branches? Answer: 'git branch -r' if branches are local.
	* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?		* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...?
	* Should it be 'origin/0.92.x' rather than '0.92.x'?		* Should it be 'origin/0.92.x' rather than '0.92.x'?

← Older revision		Revision as of 17:48, 14 June 2017
Line 8:		Line 8:
	*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).		*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).
	** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:		** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:
	*** <s>Release branches (''inkscape.dev_RELEASE_0_91_BRANCH'', ''inkscape.board_0.92.x'', etc.) are renamed to plain ''0.91.x'', ''0.92.x'', etc. This will automatically put them at the top of the branch list and should make searching for them easy.</s> (done by Eduard)		*** <s>Release branches (''inkscape.dev_RELEASE_0_91_BRANCH'', ''inkscape.board_0.92.x'', etc.) are renamed to plain ''0.91.x'', ''0.92.x'', etc. This will automatically put them at the top of the branch list and should make searching for them easy.</s> (done) [Eduard]
	*** Other branches: Keep for now; see next bullet point		*** Other branches: Keep for now; see next bullet point
	** Sort through other branches that are not release branches		** Sort through other branches that are not release branches
Line 18:		Line 18:
	** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]		** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
	** macOS: [tghs]		** macOS: [tghs]
	** <s>Windows: CI via Appveyor and MSYS2</s> [https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done] [Eduard]		** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]
	* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:		* Decide on how we want to handle commit and repo access in the future.<br>GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:
	** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.		** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.
Line 25:		Line 25:
	* Finalize set-up of GitLab repo		* Finalize set-up of GitLab repo
	** The previous bullet point will decide some settings regarding repo access		** The previous bullet point will decide some settings regarding repo access
	** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce)<br>~~Might need reverting~~ as ~~it seems there's no~~ "~~Rebase" functionality on GitLab.com making it impossible to merge most MEs automatically (the setting~~ [https://docs.gitlab.com/ee/workflow/rebase_before_merge.html] ~~seems~~ to be ~~missing~~)		** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce)<br>Should be reverted as the "[https://docs.gitlab.com/ee/workflow/rebase_before_merge.html Rebase button]" is only shown for people having write permissions on the branch to be merged (i.e. typically only the requester) making it impossible to merge most MEs via web UI.
	** <s>PRs are non-public right now</s> (seems already fixed)		** <s>PRs are non-public right now</s> (seems already fixed)
	** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)		** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)