Development/Tutorials/Git/Recipes - Revision history

AnneW: moved Archive:Development/Tutorials/Git/Recipes to Development/Tutorials/Git/Recipes: revert

2012-03-24T19:38:28Z

moved Archive:Development/Tutorials/Git/Recipes to Development/Tutorials/Git/Recipes: revert

AnneW: moved Development/Tutorials/Git/Recipes to Archive:Development/Tutorials/Git/Recipes

2012-03-24T19:17:26Z

moved Development/Tutorials/Git/Recipes to Archive:Development/Tutorials/Git/Recipes

Neverendingo: Text replace - "`" to ""`


2011-06-29T18:53:43Z
Text replace - "<code>" to "<syntaxhighlight lang="bash">"

				
				
				
				
			
			← Older revision
			Revision as of 18:53, 29 June 2011
			
Line 7:
Line 7:
    
  When you issue:   When you issue:
− <code>git branch -a</syntaxhighlight> + <syntaxhighlight lang="bash">git branch -a</syntaxhighlight>
  you get   you get
− <code> + <syntaxhighlight lang="bash">
  * master   * master
     remotes/origin/4.6      remotes/origin/4.6
Line 28:
Line 28:
  You need to backport to the last released version, which lives in the remotes/origin/KDE/4.6:   You need to backport to the last released version, which lives in the remotes/origin/KDE/4.6:
    
− <code> + <syntaxhighlight lang="bash">
  git checkout -b KDE/4.6 origin/KDE/4.6   git checkout -b KDE/4.6 origin/KDE/4.6
  </syntaxhighlight>   </syntaxhighlight>
  This will get get you on the backport branch. Verify the diff between this old branch and the origin branch where you commited your fix :   This will get get you on the backport branch. Verify the diff between this old branch and the origin branch where you commited your fix :
− <code> + <syntaxhighlight lang="bash">
  git diff origin <fileYouModified>   git diff origin <fileYouModified>
  </syntaxhighlight>   </syntaxhighlight>
    
  To apply your fix, do this:   To apply your fix, do this:
− <code> + <syntaxhighlight lang="bash">
  git cherry-pick 0f601b3d28   git cherry-pick 0f601b3d28
  </syntaxhighlight>   </syntaxhighlight>
  You just applied your fix (well, if you get merging errors, just fix them as usual). See it by yourself:   You just applied your fix (well, if you get merging errors, just fix them as usual). See it by yourself:
− <code>git log</syntaxhighlight> + <syntaxhighlight lang="bash">git log</syntaxhighlight>
    
  Now push your changes:   Now push your changes:
− <code> + <syntaxhighlight lang="bash">
  git push   git push
  </syntaxhighlight>   </syntaxhighlight>
  Don't forget to get back on the main branch:   Don't forget to get back on the main branch:
− <code>git checkout master</syntaxhighlight> + <syntaxhighlight lang="bash">git checkout master</syntaxhighlight>

`Neverendingo: Text replace - "`" to ""

2011-06-29T18:41:47Z

Text replace - "</code>" to "</syntaxhighlight>"

Odysseus at 14:07, 1 March 2011

2011-03-01T14:07:48Z

Vrusu: /* Backporting fixes */

2011-02-01T21:44:11Z

‎Backporting fixes

Vrusu: Created page with '===GIT/KDE useful recipes=== == Backporting fixes == Let's say you just fixed a bug in kde-apps and you commited it to the master and git reported it as commit id 0f601b3d28. Yo...'

2011-02-01T21:42:37Z

Created page with '===GIT/KDE useful recipes=== == Backporting fixes == Let's say you just fixed a bug in kde-apps and you commited it to the master and git reported it as commit id 0f601b3d28. Yo...'

New page

===GIT/KDE useful recipes===

== Backporting fixes ==
Let's say you just fixed a bug in kde-apps and you commited it to the master and git reported it as commit id 0f601b3d28. You want now to get it backported to the latest released version.

When you issue:
<code>git branch -a</code>
you get
<code>
* master
remotes/origin/4.6
remotes/origin/HEAD -> origin/master
remotes/origin/KDE/4.0
remotes/origin/KDE/4.1
remotes/origin/KDE/4.2
remotes/origin/KDE/4.3
remotes/origin/KDE/4.4
remotes/origin/KDE/4.5
remotes/origin/KDE/4.6
remotes/origin/kdepim/enterprise-4.0.83
remotes/origin/kdepim/enterprise-4.1
remotes/origin/master
</code>
The red-colored lines are showing you the branches that are living into the main repository (you must have enabled git colors before this).

You need to backport to the last released version, which lives in the remotes/origin/KDE/4.6:

<code>
git checkout -b KDE/4.6 origin/KDE/4.6
</code>
This will get get you on the backport branch. Verify the diff between this old branch and the origin branch where you commited your fix :
<code>
git diff origin <fileYouModified>
</code>

To apply your fix, do this:
<code>
git cherry-pick 0f601b3d28
</code>
You just applied your fix (well, if you get merging errors, just fix them as usual). See it by yourself:
<code>git log</code>

Now push your changes:
<code>
git push
</code>
Don't forget to get back on the main branch:
<code>git checkout master</code>

← Older revision		Revision as of 14:07, 1 March 2011
Line 1:		Line 1:
		+	{{warning\|This page is yet to be reviewed for changes required by the migration to Git. Information and commands on this page may no longer be valid and should be used with care. Please see the [[Development/Git\|KDE Git hub page]] for more details. }}
		+
	===GIT/KDE useful recipes===		===GIT/KDE useful recipes===

@@ Line 1: / Line 1: @@
 ===GIT/KDE useful recipes===
-== Backporting fixes ==
+===Backporting fixes===
 Let's say you just fixed a bug in kde-apps and you commited it to the master and git reported it as commit id 0f601b3d28. You want now to get it backported to the latest released version.