[Sputnik-list] "Messages" section

[pierre pracht]

Le 8 mars 08 à 21:38, Yuri Takhteyev a écrit :

>> Several patch need to be reviewed for inclusion in master branch :
>
> Those changes all look good.  I'll just have to figure out how exactly
> to integrate changes from one clone to another.

To easy :
# take my clone in a branch

# make local branch and go in it
git checkout -b blueprint
# add url in git here read-ony (can be rw)
git remote add blueprint git://gitorious.org/sputnik/blueprint.git
# take update
# git pull remote_repro from_remote_branch:to_local_branch
git pull blueprint master: blueprint
#look log to see if all is here
git log
# or better for latter cherry-pick
# keep a term on this :
git log --abbrev-commit

#make a branch to stage change before put them in master

#go to master
git checkout master
# make local branch and go in it
git checkout -b test_merge

#and here applaud
git-cherry-pick b30e571
git-cherry-pick c338c5b
# you know the number in
# http://gitorious.org/projects/sputnik/repos/blueprint/browse
# and my bug repport

#test
#test
#make other correction (commit)

#continnue git-cherry-pick or stop here

#bring back to master

#go to master
git checkout master
#take from test merge
git rebase test_merge

#verify
git log

#remove test_merge
git branch -d test_merge

#test a last time

#publish
git push
#as I understand it would only push master by default
#otherwise
git push origin master:master

#and git is ...

- pierre