Home Wiki > openSUSE:Artwork git
Sign up | Login

openSUSE:Artwork git

tagline: From openSUSE


Icon-cleanup.png This article is in need of attention because it does not follow our wiki guidelines.
Also:It is incorrect server and there is similar article openSUSE:Marketing_and_Artwork_repository.
If you want to contribute, please read the rules for this wiki and if you have any questions, don't hesitate to contact the wiki team, we are more then willing to help you! :-)
This page gives some general info about using git. You'll probably have to google or ask on IRC to get more in-depth knowledge...

where to find it

The openSUSE artwork can be found on the opensuse-artwork gitorious pages. Gitorious provides a nice web interface over git, a source code management (SCM) system.

Gitorious speaks for itself, it is not terribly complicated. To find the artwork, you'll have to click on 'source tree' first, however, before you can browse the folders with artwork.

checkout big pieces

Not everything can be downloaded from the web interface as much artwork is too big for that. Anything bigger than about 4 MB has to be 'checked out'. Or downloaded with all of the repository: click on the "download Master as tar.gz" and you'll get all the openSUSE artwork!

If you frequently need pieces from openSUSE artwork, it might be more efficient to do a 'clone' of the repository on your harddrive. You'll get all of it and can update the clone without having to download everything all the time.

Doing this is not complicated, you can use the command given at the main gitorious openSUSE-artwork page. On top there you see "clone & push urls". Click on the green question mark to find detailed instructions.

contribute

Pushing code ??????

handle merge requests

Here we describe how to handle a merge request.

When we have a request it will normally be numbered 1. Check the merge requests here 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 (checkout) place using a terminal

(yes that awfull powerfull black backgrounded :-)
cd openSUSE/artwork/git/opensuse-artwork/

Refresh your 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 is new

For example in 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

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.