svn branches/tags, git-svn and merges

["Michael S. Tsirkin" <mst@redhat.com>]

Hello!
Here's the record of the changes I made to the svn repository.

I have tagged 1.0 cs02 to match the released specification.
This was as easy as
	git branch -t v1.0-cs02

I have also updated the trunk with all changes made on 1.0
branch.  The following seems to have worked fine for this
purpose:

git config --global svn.pushmergeinfo true
git checkout -b master origin/trunk
git svn fetch
git svn rebase -l
git merge --no-ff origin/v1.0
[ resolved merge conflicts ]
git svn dcommit

Since this worked well, I think it's best to apply bugfixes on 1.0
branch first and forward-port them to trunk, as described above, while
features are added directly on trunk.

-- 
MST