Git-svn - Revision history

Aurelien.falco: /* Known issues */

2025-04-30T16:35:15Z

‎Known issues

Aurelien.falco: /* Commit a local git branch to svn */

2025-02-12T11:03:05Z

‎Commit a local git branch to svn

Aurelien.falco: Details on sending changes to svn

2025-02-12T11:00:59Z

Details on sending changes to svn

Aurelien.falco at 16:36, 13 December 2024

2024-12-13T16:36:10Z

Aurelien.falco: Explain a fix if out of sync

2024-11-28T13:33:09Z

Explain a fix if out of sync

Aurelien.falco: /* pre-push hook */ typo

2024-10-15T13:00:31Z

‎pre-push hook: typo

Aurelien.falco: Contact for svn and git admin rights

2024-10-02T09:40:37Z

Contact for svn and git admin rights

Aurelien.falco: category

2024-09-18T13:23:18Z

Aurelien.falco: Explanations of the git-svn system, the pre-push hook, etc

2024-09-18T13:18:54Z

Explanations of the git-svn system, the pre-push hook, etc

New page

[https://git-scm.com/docs/git-svn ''Git-svn''] is an extension of git that allows a git branch to commit to (and get updates from) a svn repository.

It can be installed via the following command on a linux system:
<syntaxhighlight lang="bash">
sudo apt install git-svn
</syntaxhighlight>

To simplify things, a [[Git-svn#install_script|script]] has been created to make the link and ensure the svn is up-to-date/updated when you use [[Git_usage#Simple_commands|''git push'']].

== Install script ==

The installation script can be found in the repository in the UTIL folder. You can run it with:

<syntaxhighlight lang="bash">
./UTIL/git_init.sh
</syntaxhighlight>

The script will:
* Initialize the git-svn branch to follow the [[Some_pointers_about_the_subversion_(svn)_tool|svn repository]],
* Install the pre-push hook in your ''.git/hooks'' folder.

== pre-push hook ==

This hook is launched each time you run the '''git push''' command.
It has been modified to run two main commands: a '''git svn rebase''', followed by a '''git svn dcommit''' (see [[Git-svn#git_svn_commands|below]]).

Due to how the pre-push hook is designed, you will need to run the the ''git push'' command twice.
The way the script works is summarized in the following diagram.
[[File:pre-push.png|800px]]

The reason why two pushes are necessary is detailed below:

The pre-push hook is designed to push the commits as they were ''before'' entering the hook. And, since the ''git svn dcommit'' command changes the hashes of the commits during the hook, the commits that would be pushed after the hook would be the ones before the ''git svn dcommit'' and therefore the git remote master branch would be late compared to the svn repository. The script thus returns with an 'error', telling the user a second push is required. The second push will effectively push the new commits on the git remote master branch. Note that the svn is updated after the first push.

== git svn commands ==

There are two main commands related to this system:
* '''git svn rebase''': This command will get changes from the svn and try to apply your local changes on top of it.
* '''git svn dcommit''': This command will change the hashes of local commits (adding the svn revision to the name of the commit) and commit to the svn. The local commits are not pushed to the git remote repository.

@@ Line 64: / Line 64: @@
 git update-ref refs/remotes/git-svn refs/heads/master
 </pre>
 [[Category:FAQ]]

@@ Line 30: / Line 30: @@
 <pre>
 git checkout master   # if you have local changes, use git stash + git stash pop afterwards
-git rebase mybranch   # get mybranch on master branch
+git rebase mybranch   # get mybranch changes on master branch
 git push              # send to svn through the git pre-push hook
 git push              # send to git remote master branch
 </pre>
 == pre-push hook ==

@@ Line 1: / Line 1: @@
-[https://git-scm.com/docs/git-svn ''Git-svn''] is an extension of git that allows a git branch to commit to (and get updates from) a svn repository. This page explains how to install it and use it in the context of the [[Git|PCM project]].
+[https://git-scm.com/docs/git-svn ''Git-svn''] is an extension of git that allows a git branch to commit to (and get updates from) a svn repository. This page explains how to install it and use it in the context of the [[Git|PCM git project]].
 === <u>'''Admin rights'''</u> ===
@@ Line 24: / Line 24: @@
 * Initialize the git-svn branch to follow the [[Some_pointers_about_the_subversion_(svn)_tool|svn repository]],
 * Install the pre-push hook in your ''.git/hooks'' folder.
 == pre-push hook ==

@@ Line 1: / Line 1: @@
-[https://git-scm.com/docs/git-svn ''Git-svn''] is an extension of git that allows a git branch to commit to (and get updates from) a svn repository. This page explains how to install it and use it in the context of the PCM project.
+[https://git-scm.com/docs/git-svn ''Git-svn''] is an extension of git that allows a git branch to commit to (and get updates from) a svn repository. This page explains how to install it and use it in the context of the [[Git|PCM project]].
 === <u>'''Admin rights'''</u> ===
@@ Line 14: / Line 14: @@
 To simplify things, a [[Git-svn#install_script|script]] has been created to make the link and ensure the svn is up-to-date/updated when you use [[Git_usage#Simple_commands|''git push'']].
 The installation script can be found in the repository in the UTIL folder. You can run it with:

← Older revision		Revision as of 13:33, 28 November 2024
Line 45:		Line 45:
	* '''git svn dcommit''': This command will change the hashes of local commits (adding the svn revision to the name of the commit) and commit to the svn. The local commits are not pushed to the git remote repository.		* '''git svn dcommit''': This command will change the hashes of local commits (adding the svn revision to the name of the commit) and commit to the svn. The local commits are not pushed to the git remote repository.

		+	== Known issues ==
		+
		+	If you somehow get svn to be desynchronized with the git remote master branch, you can re-synchronize the tags with:
		+	<pre>
		+	git update-ref refs/remotes/git-svn refs/remotes/origin/master
		+	</pre>
		+	You may encounter an other issue if git-svn seems to be up-to-date but is not, during the git svn rebase, which might happen due to the local master branch being out of sync with svn. Then synchronize with:
		+	<pre>
		+	git update-ref refs/remotes/git-svn refs/heads/master
		+	</pre>
	[[Category:FAQ]]		[[Category:FAQ]]

@@ Line 31: / Line 31: @@
 It has been modified to run two main commands: a '''git svn rebase''', followed by a '''git svn dcommit''' (see [[#git_svn_commands|below]]).
-Due to how the pre-push hook is designed, you will need to run the the ''git push'' command twice.
+Due to how the pre-push hook is designed, you will need to run the ''git push'' command twice.
 The way the script works is summarized in the following diagram.
 [[File:pre-push.png|800px]]
@@ Line 38: / Line 38: @@
 The pre-push hook is designed to push the commits as they were ''before'' entering the hook. And, since the ''git svn dcommit'' command changes the hashes of the commits during the hook, the commits that would be pushed after the hook would be the ones before the ''git svn dcommit'' and therefore the git remote master branch would be late compared to the svn repository. The script thus returns with an 'error', telling the user a second push is required. The second push will effectively push the new commits on the git remote master branch. Note that the svn is updated after the first push.
 == git svn commands ==

← Older revision		Revision as of 13:23, 18 September 2024
Line 39:		Line 39:
	* '''git svn rebase''': This command will get changes from the svn and try to apply your local changes on top of it.		* '''git svn rebase''': This command will get changes from the svn and try to apply your local changes on top of it.
	* '''git svn dcommit''': This command will change the hashes of local commits (adding the svn revision to the name of the commit) and commit to the svn. The local commits are not pushed to the git remote repository.		* '''git svn dcommit''': This command will change the hashes of local commits (adding the svn revision to the name of the commit) and commit to the svn. The local commits are not pushed to the git remote repository.
		+
		+	[[Category:FAQ]]