« Return to Thread: What's up

Re: What's up

by bART Janssens-2 :: Rate this Message:

On Sun, Jun 7, 2009 at 5:12 PM, Timothy M. Shead<tshead@...> wrote:

> Bart Janssens wrote:
>> On Thu, Jun 4, 2009 at 7:55 AM, Timothy M. Shead<tshead@...> wrote:
>>> that geometric primitives have been generalized. Interestingly, I'm
>>> using mercurial to make a lot of small commits locally, before I push
>>
>> Are you using mercurial, or git? I'd like to set up a local repository
>> here too, so it's probably best if we use the same. How do you
>> interface with the existing SVN repository?
>
> I've definitely settled on mercurial - I am using it with the
> hgsubversion extension, YMMV.

OK, I'm using hgsvn, which now has hgpushsvn as well. I see in the
repository that I goofed up somewhere, and undid and then redid your
latest LuxRender change, dunno why. Here's what I did:
- commit my changes to the eclipse workspace clone
- hgpullsvn in my svn copy
- pull from svn copy to eclipse clone
- merge changes in the svn clone
- push changes from the eclipse clone to the svn copy
- run hg update in the svn copy
- run hgpushsvn to commit changes

I think I missed something about how I can combine changes from both
SVN and myself. Either way, I'm convinced that Mercurial Eclipse will
work out fine for me, so as far as I'm concerned we can switch to
Mercurial as the main version control system.

Cheers,

--
Bart

------------------------------------------------------------------------------
_______________________________________________
K3d-development mailing list
K3d-development@...
https://lists.sourceforge.net/lists/listinfo/k3d-development

« Return to Thread: What's up