Oh… Why did it annoy you?

My normal workflow is:

$ git svn rebase
$ git checkout -b topic

# work

$ git checkout master
$ git svn rebase
$ git checkout topic
$ git rebase master
$ git checkout master
# And since 10 seconds ago:
$ git merge --squash topic

# sanity check:
$ git svn rebase

# push
$ git svn dcommit

I wouldn't do the squashing actually, as I see no problem with many commits. Actually I find it handier, as you can follow the development better with narrative commit messages etc. The "real" problem IMO is that the commit emails can be annoying and what we miss is a good browser. For this purpose I use gitx locally, which is way faster anyways, or github (to where I push my git svn checkout).

Hope this answers your questions.

Cheers,
Eloy

On 3 aug 2009, at 22:15, Matt Aimonetti wrote:

hmm maybe I should give git-svn another chance. (it annoyed me so much I went back to svn)

Eloy, would you mind giving a quick rundown of your setup and workflow?

Thanks,

- Matt


On Mon, Aug 3, 2009 at 1:01 PM, Eloy Duran <eloy.de.enige@gmail.com> wrote:
Btw: About git-svn creating many commits, I wouldn't worry about it :) But if you'd like to normalize, I'd do something like:

$ git checkout -b yaml_branch

# work on it

$ git checkout master
$ git diff yaml_branch | patch -p1

$ git add .
$ git commit -v

Eloy
 
On 3 aug 2009, at 19:51, Patrick Thomson wrote:

Hi everyone,

I've just pushed my work on a new YAML module to the experimental branch (revision 2184). Rather than being backed by the old syck code that 1.8/1.9 use, this is backed by the libYAML library (BSD licensed). As of right now it appears to be about 4x slower than 1.9's YAML module, but there's a lot of room for optimizing my code.

This new YAML module aims to be wholly compatible with the old API inside yaml.rb. Please test this module out, and let me know if you find any inconsistencies or false results. As of right now it passes the RubySpecs for YAML::dump() and YAML::load().

(Oh, and sorry for spamming the macruby-changes list; git-svn applied something like 40 commits at one time. Oops!)

-- Patrick Thomson
_______________________________________________
MacRuby-devel mailing list
MacRuby-devel@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel


_______________________________________________
MacRuby-devel mailing list
MacRuby-devel@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel


_______________________________________________
MacRuby-devel mailing list
MacRuby-devel@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macruby-devel