On Tue, Jan 6, 2009 at 3:07 PM, Andrew Straw wrote:
> Hi Mike, This sounds like good news. I am swamped right now, but I hope
> to get the git mirror on github up-to-date early next week when work is
> a little less busy.
>
> John (or any developer with SF admin capabilities), if we could set up
>
Hi Mike, This sounds like good news. I am swamped right now, but I hope
to get the git mirror on github up-to-date early next week when work is
a little less busy.
John (or any developer with SF admin capabilities), if we could set up
some kind of auto-notification on SVN commits, I could possibly
I have successfully used the git mirror to commit changes to the
maintenance branch. I've updated the matplotlib developer docs to
describe how to do it (not that bad really), though it takes a while
given the v0_98_4 "oops" branch ;) I have yet to figure out all the
loop-de-loops required to
Thanks. These are really helpful pointers. For me, this is the one
missing piece that would help me use git full-time, particularly with
the way matplotlib and other projects I work on are laid out in SVN. So
I'm pretty motivated to figure this out.
I'll certainly share any findings in this
Hi Mike,
I have not imported the branches. ( IIRC, this was there were several
that weren't MPL but other parts of the repo such as py4science,
toolkits and so on). It may be possible to add just the 0.98.5
maintenance branch without the others, but I won't have a chance
immediately to play aroun
Thanks. I've incorporated your docs into the developer documentation.
My next experiment will be to see if I can track the 0.98.5 maintenance
branch with git. SVN tags/* show up as available remote branches, but
not branches/*, which leaves me a bit stumped? If you've done this and
there's a
Andrew Straw wrote:
> Andrew Straw wrote:
>
> I realize I may have ignored an important question.
>
>
>> Michael Droettboom wrote:
>>
>
>
>>> Now I feel stuck. How do I "undo" the merge from experimental to master?
>>>
>
> To do that, I actually delete the master branch with "git
Andrew Straw wrote:
I realize I may have ignored an important question.
> Michael Droettboom wrote:
>> Now I feel stuck. How do I "undo" the merge from experimental to master?
To do that, I actually delete the master branch with "git branch -D
master" and then re-create a new one with "git che
Hi Michael,
The main issue is that we can't use git "normally" because the main
history will be kept with svn. Thus, there's going to be a lot of
history rewriting going on through the rebase command. (These
complications are obviously not the ideal scenario for git newbies...)
Rather than answer
