On 06/07/2011 05:27 PM, Bruno Friedmann wrote:
> On 06/07/2011 12:44 PM, Jos Poortvliet wrote:
>> Hi all,
>>
>> There's a merge request for the artwork repository. I could try and get it 
>> merged but that'll take me half a day... Sorry but I try to keep away from git 
>> as much as I can, too complicated for this simple mind. Maybe someone with 
>> some git fu can take care of it? Or is it possible to do it from gitorious, I 
>> tried to figure that out but couldn't...
>>
>> https://gitorious.org/opensuse-artwork/opensuse-artwork/merge_requests/1
> 
> Ok I will pick that tonight (CEST)
> 
> 

Done, here the sequence used (full as Jos start it ... :- )

Admit we have a request it will normally numbered 1
Check who and if we have it
https://gitorious.org/opensuse-artwork/opensuse-artwork/merge_requests

And follow the howto

One way to merge in these changes is to pull them into a local branch for review,
verifying the changes and then merge to back to master.

# Go to you git co place using a terminal (yes that awfull powerfull black backgrounded :-)
cd openSUSE/artwork/git/opensuse-artwork/

#Refresh you repo
git pull

# Check out a new branch for integration
git checkout -b merge-requests/1

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/opensuse-artwork/opensuse-artwork.git \
  refs/merge-requests/1
#Press enter at that stage
# git will download what new
# For example of this case

remote: Counting objects: 25, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 22 (delta 9), reused 0 (delta 0)
Unpacking objects: 100% (22/22), done.
>From git://gitorious.org/opensuse-artwork/opensuse-artwork
 * branch            refs/merge-requests/1 -> FETCH_HEAD
Updating 4fca804..544c237
Fast-forward
 banners/ro/ro_baner_v6.png           |  Bin 0 -> 374836 bytes
 banners/ro/ro_baner_v6.svg           | 2337 ++++++++++++++++++++++++++++++++++
 banners/ro/ro_baner_v7.png           |  Bin 0 -> 327707 bytes
 banners/ro/ro_baner_v7.svg           | 2160 +++++++++++++++++++++++++++++++
 business_cards/ro/cartevizita_v1.png |  Bin 0 -> 13257 bytes
 business_cards/ro/cartevizita_v1.svg |  240 ++++
 business_cards/ro/cartevizita_v2.png |  Bin 0 -> 13261 bytes
 business_cards/ro/cartevizita_v2.svg |  240 ++++
 business_cards/ro/cartevizita_v3.png |  Bin 0 -> 13271 bytes
 business_cards/ro/cartevizita_v3.svg |  261 ++++
 business_cards/ro/cartevizita_v4.png |  Bin 0 -> 14532 bytes
 business_cards/ro/cartevizita_v4.svg |  293 +++++
 business_cards/ro/cartevizita_v5.png |  Bin 0 -> 14702 bytes
 business_cards/ro/cartevizita_v5.svg |  297 +++++
 business_cards/ro/cartevizita_v8.png |  Bin 0 -> 21717 bytes
 business_cards/ro/cartevizita_v8.svg |  306 +++++
 16 files changed, 6134 insertions(+), 0 deletions(-)
 create mode 100644 banners/ro/ro_baner_v6.png
 create mode 100644 banners/ro/ro_baner_v6.svg
 create mode 100644 banners/ro/ro_baner_v7.png
 create mode 100644 banners/ro/ro_baner_v7.svg
 create mode 100644 business_cards/ro/cartevizita_v1.png
 create mode 100644 business_cards/ro/cartevizita_v1.svg
 create mode 100644 business_cards/ro/cartevizita_v2.png

 create mode 100644 business_cards/ro/cartevizita_v2.svg

 create mode 100644 business_cards/ro/cartevizita_v3.png

 create mode 100644 business_cards/ro/cartevizita_v3.svg

 create mode 100644 business_cards/ro/cartevizita_v4.png

 create mode 100644 business_cards/ro/cartevizita_v4.svg

 create mode 100644 business_cards/ro/cartevizita_v5.png

 create mode 100644 business_cards/ro/cartevizita_v5.svg

 create mode 100644 business_cards/ro/cartevizita_v8.png

 create mode 100644 business_cards/ro/cartevizita_v8.svg

# At that stage, please use normal file explorer and art software to review carefully the content
# Note all things that need to be changed so you can do that immediately

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/1

# To apply the changes to your branch:
git checkout master

# For example I've directly modify files before merging
git checkout master
M       banners/ro/ro_baner_v6.png
M       banners/ro/ro_baner_v6.svg
M       banners/ro/ro_baner_v7.png
M       banners/ro/ro_baner_v7.svg
# Already on 'master'
# Your branch is ahead of 'origin/master' by 1 commit. (git know that I've already change something

git merge merge-requests/1
git push origin master
Total 0 (delta 0), reused 0 (delta 0)
=> Syncing Gitorious... [OK]
To git@gitorious.org:opensuse-artwork/opensuse-artwork.git
   4fca804..544c237  master -> master

git pull

Go to the web interface, then close the case by a nice comment.

#Then for my own changes
I follow the normal way

Jos, or any of the wiki master, can you just copy/paste adjust that mail to the wiki page ?


-- 

Bruno Friedmann
Ioda-Net Sàrl www.ioda-net.ch

openSUSE Member & Ambassador
GPG KEY : D5C9B751C4653227
irc: tigerfoot
-- 
To unsubscribe, e-mail: opensuse-artwork+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-artwork+help@opensuse.org