Re: svn commit: r886743 [1/4] - in /ofbiz/branches/addbirt: applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/payment/report/ applications/account...

[Scott Gray]

On 4/12/2009, at 9:12 AM, Joe Eckard wrote:

On Dec 3, 2009, at 2:50 PM, Scott Gray wrote:

On 4/12/2009, at 7:32 AM, Adam Heath wrote:

Scott Gray wrote:

Hi Hans,

When all of this comes across to the trunk could please consider

another for all this other stuff.  It'll make the commits a little

separating it into at least two commits, one for the integration and easier to read especially when people are looking at the commit history.

branch(local clone with maybe a separate local branch).  Then, a

you can do things like push/pop commits and edit them.

As I've said countless times, git makes this easier. You'd maintain a series of commits in that branch. Git supports history rewriting, so guilt(git+quilt) can help, there are also other tools that are similiar.

I'm a couple of days into using git locally and I like it so far.

But there are a couple of things people should be aware of when considering the switch: - The initial checkout takes a long time (+9 hours on my machine) although it only ever has to be done once

You can pick the revision to start your tracking at with the -r switch to avoid loading the entire project history.

Thanks for the tip, I would probably still load the entire history anyway since you only have to do it once and it's handy to have when your offline.

- The learning curve is steeper than with svn

- GUI support is limited (e.g. the Eclipse plugin is at v0.6)

- The workflows are quite different from svn so be prepared to change the way you work - Setup on OS X can be a pain (you need XCode tools installed to use the git-svn bridge and if you don't have your OS X install DVD handy it's a 1GB download)

Have you checked out "git gui" and GitX? http://gitx.frim.nl/

I use git from the command line, so I'm not sure how well the "git gui" UI works, but GitX is pretty neat.

  Reason: image not found
error: git-gui died of signal 5



Thanks for the pointers!

I haven't had a good look around yet but I'll definitely give GitX a look. git gui doesn't work OOTB on Leopard: dyld: Library not loaded: /Library/Frameworks/Tk.framework/Versions/ 8.5/Tk Referenced from: /usr/local/git/share/git-gui/lib/Git Gui.app/ Contents/MacOS/Wish Apparently it can be solved by upgrading the Tk.framework but I haven't gotten around to doing it yet.

smime.p7s
Description: S/MIME cryptographic signature