On Tue, Sep 14, 2010 at 04:51:39PM -0700, Fernando Perez wrote:
I've heard several people say that once they used git, they can't imagine
going back to SVN.
As you were writing this, Min RK and I were discussing on IRC:
minrk1 there are so many people who provide patches on github, since
On 09/15/2010 04:21 PM, Gael Varoquaux wrote:
On Tue, Sep 14, 2010 at 04:51:39PM -0700, Fernando Perez wrote:
I've heard several people say that once they used git, they can't imagine
going back to SVN.
As you were writing this, Min RK and I were discussing on IRC:
minrk1 there are so
On Wed, Sep 15, 2010 at 05:10:53PM +0900, David wrote:
It is very difficult to actually lose data with git thanks to the
reflog:
http://www.gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html
Unless you use the 'force' switches. I am trying very hard not to
use them, as I have
On 09/15/2010 05:58 PM, Gael Varoquaux wrote:
On Wed, Sep 15, 2010 at 05:10:53PM +0900, David wrote:
It is very difficult to actually lose data with git thanks to the
reflog:
http://www.gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html
Unless you use the 'force' switches. I am
On Wed, Sep 15, 2010 at 06:55:46PM +0900, David wrote:
Unless you use the 'force' switches. I am trying very hard not to
use them, as I have been advised by several good git users.
Well, yes and no. For example, you can not loose commits with any
command that I know of thanks to the reflog
On Wed, Sep 15, 2010 at 10:08:21AM +, Pauli Virtanen wrote:
Pushing to origin/master from feature should be possible:
$ git checkout feature
$ git fetch origin
$ git merge origin/master # if needed
$ git push origin feature:master
That's what I was missing! Thanks,
Gaël
On Wed, Sep 15, 2010 at 8:48 PM, Gael Varoquaux
gael.varoqu...@normalesup.org wrote:
On Wed, Sep 15, 2010 at 06:55:46PM +0900, David wrote:
Unless you use the 'force' switches. I am trying very hard not to
use them, as I have been advised by several good git users.
Well, yes and no. For
On Wed, Sep 15, 2010 at 09:54:24PM +0900, David Cournapeau wrote:
The basic way to use reflog is trivial: it just keeps a (time ordered)
list of your commits and actions, independently of the branch. So for
example, say you are in master, and by accident, you do:
git reset --hard
On Wed, Sep 15, 2010 at 8:09 AM, Gael Varoquaux
gael.varoqu...@normalesup.org wrote:
On Wed, Sep 15, 2010 at 09:54:24PM +0900, David Cournapeau wrote:
The basic way to use reflog is trivial: it just keeps a (time ordered)
list of your commits and actions, independently of the branch. So for
On Wed, Sep 15, 2010 at 03:07:52PM +, Pauli Virtanen wrote:
and pick a state that seems good, usually somebra...@{1} if you didn't do
new commits etc. on the branch yet:
$ git checkout somebra...@{1}
... check now that this is the state you'd like somebranch to have...
$ git
snip
Now that we have the repository, let's revisit the .gitignore file that I
removed from svn. IIRC, Stefan complained and Pauli more or less agreed with
the removal. However, after browsing about the net, the suggested policy is
that files that should be excluded in all the clones of the
On Wed, Sep 15, 2010 at 11:10, Charles R Harris
charlesr.har...@gmail.com wrote:
snip
Now that we have the repository, let's revisit the .gitignore file that I
removed from svn. IIRC, Stefan complained and Pauli more or less agreed with
the removal. However, after browsing about the net, the
Wed, 15 Sep 2010 11:16:35 -0500, Robert Kern wrote:
[clip: .gitignore]
*.o
*.a
*.pyc
*.swp
*~
build
*.pyo
*.so
*.pyd
.gdb_history
dist
/build
/dist
/doc/build
/doc/cdoc/build
.\#*
*.log
*.egg-info
/numpy/core/__svn_version__.py
/doc/numpy.scipy.org/_build
The .\#* is for emacs. But
On Wed, Sep 15, 2010 at 10:27 AM, Pauli Virtanen p...@iki.fi wrote:
Wed, 15 Sep 2010 11:16:35 -0500, Robert Kern wrote:
[clip: .gitignore]
*.o
*.a
*.pyc
*.swp
*~
build
*.pyo
*.so
*.pyd
.gdb_history
dist
/build
/dist
/doc/build
/doc/cdoc/build
.\#*
*.log
On Wed, Sep 15, 2010 at 1:05 AM, Travis Oliphant oliph...@enthought.com wrote:
Thanks! This is really great work. So much thanks is due to Pauli and
David for making this happen. I will get Aaron River to freeze the SVN
trunk as well as work on trac integration.
With the last
On Sep 13, 2010, at 3:46 PM, Charles R Harris wrote:
On Mon, Sep 13, 2010 at 2:33 PM, Travis Oliphant oliph...@enthought.com
wrote:
Are we ready to do this yet?
I know there were some outstanding questions. Are there major concerns
remaining? Or, is it just picking a time to
On Sep 13, 2010, at 6:20 PM, Pauli Virtanen wrote:
Mon, 13 Sep 2010 21:41:18 +, Pauli Virtanen wrote:
[clip]
I can upload a final repository today/tomorrow. If it seems OK, we can
freeze SVN trunk a few days after that.
Or we can freeze the trunk sooner than that after the final repo
On Tue, Sep 14, 2010 at 4:05 PM, Travis Oliphant oliph...@enthought.com wrote:
Here we go:
http://github.com/numpy/numpy
http://github.com/numpy/vendor
Thanks! This is really great work. So much thanks is due to Pauli and
David for making this happen. I will get Aaron
Are we ready to do this yet?
I know there were some outstanding questions. Are there major concerns
remaining? Or, is it just picking a time to freeze subversion when someone
like David or Pauli who know how to move the repository to github correctly a
time to do it.
Thanks,
-Travis
On Mon, Sep 13, 2010 at 2:33 PM, Travis Oliphant oliph...@enthought.comwrote:
Are we ready to do this yet?
I know there were some outstanding questions. Are there major concerns
remaining? Or, is it just picking a time to freeze subversion when someone
like David or Pauli who know how
Mon, 13 Sep 2010 15:33:11 -0500, Travis Oliphant wrote:
Are we ready to do this yet?
I know there were some outstanding questions. Are there major concerns
remaining?
As far as the conversion is concerned, things should be OK.
The bugs in svn-all-fast-export have been fixed in the meantime,
Mon, 13 Sep 2010 21:41:18 +, Pauli Virtanen wrote:
[clip]
I can upload a final repository today/tomorrow. If it seems OK, we can
freeze SVN trunk a few days after that.
Or we can freeze the trunk sooner than that after the final repo is
up, and patch up things manually, if something
Hi Pauli,
On Mon, Sep 13, 2010 at 5:20 PM, Pauli Virtanen p...@iki.fi wrote:
Mon, 13 Sep 2010 21:41:18 +, Pauli Virtanen wrote:
[clip]
I can upload a final repository today/tomorrow. If it seems OK, we can
freeze SVN trunk a few days after that.
Or we can freeze the trunk sooner
On Mon, Sep 13, 2010 at 3:41 PM, Pauli Virtanen p...@iki.fi wrote:
Mon, 13 Sep 2010 15:33:11 -0500, Travis Oliphant wrote:
Are we ready to do this yet?
I know there were some outstanding questions. Are there major concerns
remaining?
As far as the conversion is concerned, things should
Mon, 13 Sep 2010 18:08:39 -0600, Charles R Harris wrote:
[clip]
What is the suggested work flow for the new repositories? Is the best
way to use a github fork and push and pull from that?
Yes, I'd personally work like that. Easier to keep private stuff separate.
Pauli
Howdy,
On Mon, Sep 13, 2010 at 5:24 PM, Pauli Virtanen p...@iki.fi wrote:
What is the suggested work flow for the new repositories? Is the best
way to use a github fork and push and pull from that?
Yes, I'd personally work like that. Easier to keep private stuff separate.
in case you find
Mon, 13 Sep 2010 18:15:01 -0600, Charles R Harris wrote:
[clip]
I think we should freeze the svn repo as soon as possible. Pierre is
still making commits there and unless there is an easy way to update the
git repo from svn those sort of commits might be a small hassle.
It needs re-generation
On Mon, Sep 13, 2010 at 7:15 PM, Charles R Harris
charlesr.har...@gmail.com wrote:
On Mon, Sep 13, 2010 at 3:41 PM, Pauli Virtanen p...@iki.fi wrote:
Mon, 13 Sep 2010 15:33:11 -0500, Travis Oliphant wrote:
Are we ready to do this yet?
I know there were some outstanding questions. Are
On Mon, Sep 13, 2010 at 8:10 PM, Bruce Southey bsout...@gmail.com wrote:
On Mon, Sep 13, 2010 at 7:15 PM, Charles R Harris
charlesr.har...@gmail.com wrote:
On Mon, Sep 13, 2010 at 3:41 PM, Pauli Virtanen p...@iki.fi wrote:
Mon, 13 Sep 2010 15:33:11 -0500, Travis Oliphant wrote:
Are
29 matches
Mail list logo
