January 2009 - Zypp Development - openSUSE Mailing Lists

[zypp-devel] [ANNOUNCE] ZYpp repositories branched
by Duncan Mac-Vicar Prett 08 Jan '09

08 Jan '09

The ZYpp repositories in git.opensuse.org have been branched. SuSE-Code-11-Branch will carry further 11.1 fixes. Cheers Duncan -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Code11 Branch?
by Duncan Mac-Vicar Prett 08 Jan '09

08 Jan '09

Now that the migration to git is (theoretically) done. What about branching all repositories with a Code11 Branch? Duncan -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1

[zypp-devel] git example usage, committing to a maintenance branch
by Duncan Mac-Vicar Prett 08 Jan '09

08 Jan '09

NOTE: Before doing any push, make sure the git identity is set correctly to your email address. git config --global user.name "Your Name Comes Here" git config --global user.email you(a)yourdomain.example.com (If you don't use --global the config is for that checkout only, the default is your login@host, so please make sure it is set) Note, this is a step by step on how to commit a change to a branch without having a separate I checked out sat solver. So I list branches: # sat-solver> git branch -a * master origin/HEAD origin/SuSE-Linux-11_0-Branch origin/master The -a option tells git to list also remote branches. The default remote is origin, which is the one from which we checked out. One can have multiple remotes in parallel (for example push & backup to github.com). Remote branches don't exist in our repo. We checkout the remote branch in a local branch. We use checkout -b LB RB, which is the same as git branch RB LB and then git checkout LB. # sat-solver> git checkout -b 11_0 origin/SuSE-Linux-11_0-Branch Branch 11_0 set up to track remote branch refs/remotes/origin/SuSE-Linux-11_0-Branch. Switched to a new branch "11_0" # sat-solver> Now there are two local branches. The * indicates which one is the checkout copy (the workspace). # sat-solver> git branch * 11_0 master If you examine the git config, you can see the branch was added there, and by default it tracks the remote branch, that means if you pull from the remote (git pull) without specifying more parameters, if you are standing in the local 11_0 branch it will look for commits in the remote origin/SuSE-Linux-11_0-Branch cat .git/config [branch "11_0"] remote = origin merge = refs/heads/SuSE-Linux-11_0-Branch Then I edit some file: # sat-solver/package> vi libsatsolver.changes Or, alternatively, if you are more cool: # sat-solver/package> emacs libsatsolver.changes Then, you have to add that change to the index, which is what git takes in consideration for commit: # sat-solver/package> git add libsatsolver.changes # sat-solver/package> git commit -m "update changelog" You can skip that step by using git commit -a -m "msg" which commits every change. The index is useful because you can have multiple changes in the workspace and you can commit only some of them. You can even commit part of the changes in a file and some not by using git-add-interactive (I am not sure if that is the right command, something like that). Then I made my first mistake, I pushed: # sat-solver> git push Everything up-to-date And I expected that git would figure out where to push from the added "merge" line in config. It seems you have to add a push: line in config too, or specify it: (I am sure there is an easier way here ;-) ) # sat-solver> git push origin 11_0:SuSE-Linux-11_0-Branch Counting objects: 7, done. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 522 bytes, done. Total 4 (delta 2), reused 0 (delta 0) To git@git.opensuse.org:projects/zypp/sat-solver.git 9ac4503..9cda046 11_0 -> SuSE-Linux-11_0-Branch Duncan -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] [ANNOUNCE] ZYpp project migrated to git.opensuse.org and more!
by Duncan Mac-Vicar Prett 05 Jan '09

05 Jan '09

You may have noticed (or not?) that svn.opensuse.org/svn/zypp is now read-only :-) Just a few hours ahead of the original plan ;-) the ZYpp project repository is now hosted on git.opensuse.org. The following pages were updated to reflect the move: http://en.opensuse.org/Libzypp/Devel http://en.opensuse.org/Package_Management/Sat_Solver Those also link to the new pages, written as a starting point: http://en.opensuse.org/Git http://en.opensuse.org/Git_Hosting Those pages should cover how to checkout the code (change svn checkout for git clone and svn up to gut pull ), as well starting points for contributors. If you are going to contribute please learn the basics about pushing, merging vs rebasing when developing features in private branches, etc. You can contribute with or without push access (you can push patches that can be sent to the mailing list). Your checkout is the full repository and history, which allows you to "maintain" your own forks and keep them in sync. Note, for push access, I need your ssh keys, unless they are already in another project in git.opensuse.org. Not everything was about git. We needed to replicate the automated building/testing process, which is a core part of the ZYpp team development model. The process has been migrated from cruisecontrol.rb to Hudson ( Extensible continuous integration engine, https://hudson.dev.java.net/) which provides better job handling support, plugins and it is not tied to svn. I would like to thank R. Tyler at #hudson@freenode for fixing one of the bugs in the Hudson git2 plugin that made most of the problems ;-) As new features is that we now build zypper, and building PackageKit automatically from upstream over our libzypp-head is also coming soon! As expected, we have yet to check that the repositories are correct. We don't expect any problems and everything looks good, but just be prepared for minor issues, also with the automatic build, notifications, spam, etc ;-) Please test the repositories and tell us about any problem. Duncan -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

3 2