OASIS Mailing List ArchivesView the OASIS mailing list archive below
or browse/search using MarkMail.

 


Help: OASIS Mailing Lists Help | MarkMail Help

virtio message

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]


Subject: Re: [virtio] Your version control SVN project is set up


On Mon, 2013-08-26 at 13:31 +0300, Michael S. Tsirkin wrote:
> On Fri, Aug 16, 2013 at 12:51:37PM +0930, Rusty Russell wrote:
> > Chet Ensign <chet.ensign@oasis-open.org> writes:
> > 
> > > Members of the VIRTIO TC,
> > >
> > > As requested, we have set up an SVN project for you. You can access it at
> > > https://tools.oasis-open.org/version-control/browse/wsvn/virtio/?sc=0
> > 
> > Thanks Chet!
> > 
> > OK, here's the quickstart for using it with git-svn:
> > 
> >   # Create local virtio subdir with git - svn bridge.
> >   git svn clone https://tools.oasis-open.org/version-control/svn/virtio
> > 
> >   # To update from svn repo
> >   git svn pull
> 
> This one doesn't seem to work for me. I only have fetch.

right, to use git on an SVN repository, you have to do

git svn fetch
git svn rebase

The reason is that the SVN workflow is simplistic compared to git, so
uncommitted patches you intend to push into the SVN repo have to be at
the top of the git tree (hence you need to keep rebasing them).

James


> >   # To update from svn repo and rebase your (unpublished) git commits
> >   git svn rebase
> > 
> >   # To push your changes into repo
> >   git svn dcommit
> > 
> > I've pushed the virtio-spec with all changes posted here into the
> > repository, so it should now be a reasonable startpoint for any diffs
> > you want to post...
> > 
> > Cheers!
> > Rusty
> > 
> > 
> > ---------------------------------------------------------------------
> > To unsubscribe from this mail list, you must leave the OASIS TC that 
> > generates this mail.  Follow this link to all your TCs in OASIS at:
> > https://www.oasis-open.org/apps/org/workgroup/portal/my_workgroups.php 
> 
> ---------------------------------------------------------------------
> To unsubscribe from this mail list, you must leave the OASIS TC that 
> generates this mail.  Follow this link to all your TCs in OASIS at:
> https://www.oasis-open.org/apps/org/workgroup/portal/my_workgroups.php 
> 




[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]