{"thread":{"id":"5885","subject":"core-git and porcelains","startedAt":"2006-10-11T14:39:08Z","lastAt":"2006-10-11T18:08:46Z","messageCount":7,"participants":["Pazu","Shawn Pearce","Seth Falcon","Robin Rosenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"28601","messageId":"egivn8$5mf$1@sea.gmane.org","threadId":"5885","inReplyTo":null,"subject":"core-git and porcelains","fromName":"Pazu","fromEmail":"pazu@pazu.com.br","sentAt":"2006-10-11T14:39:08Z","receivedAt":"2006-10-11T14:39:08Z","isPatch":false,"sender":{"key":"pazu@pazu.com.br","avatar":null},"body":"I'm a newcomer to git, and for the last few days, I've been struggling \nto learn how to better use git in my day to day. One particular thing \nthat has been puzzling me is how much git is self-sufficient, and how \nmuch I should depend on porcelains.\n\nApparently, I'm not alone in this: \nhttp://thread.gmane.org/gmane.comp.version-control.git/6194/focus=6194\n\nThe above post was made about three months ago; where things stand now? \nDo you feel that git-core should suffice for most developers, or should \nI really look into something like Cogito?\n\nDepending on the project, my git usage would fit one of two profiles. I \nrun some standalone projects, where I'm the sole developer. I was \nlooking into using cogito for this scenario, but one thing that baffled \nme is how git-core and cogito use different branch representations.\n\nFor the larger part of my day, however, I'm looking into using git as a \npersonal tool in a very large corporate project; This project is \ncurrently controlled using subversion, and my idea is to use git as a \n'staging' system, where I work (possibly offline) before pushing changes \nto the upstream (remote, slow as hell) subversion repository. Here, \ngit-svn seems to be my best friend.\n\nAny advice to this poor newbie?\n\n-- Marcus\n"},{"id":"28602","messageId":"20061011150842.GA31298@spearce.org","threadId":"5885","inReplyTo":"egivn8$5mf$1@sea.gmane.org","subject":"Re: core-git and porcelains","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-10-11T15:08:42Z","receivedAt":"2006-10-11T15:08:42Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Pazu <pazu@pazu.com.br> wrote:\n> I'm a newcomer to git, and for the last few days, I've been struggling \n> to learn how to better use git in my day to day. One particular thing \n> that has been puzzling me is how much git is self-sufficient, and how \n> much I should depend on porcelains.\n> \n> Apparently, I'm not alone in this: \n> http://thread.gmane.org/gmane.comp.version-control.git/6194/focus=6194\n> \n> The above post was made about three months ago; where things stand now? \n> Do you feel that git-core should suffice for most developers, or should \n> I really look into something like Cogito?\n> \n> Depending on the project, my git usage would fit one of two profiles. I \n> run some standalone projects, where I'm the sole developer. I was \n> looking into using cogito for this scenario, but one thing that baffled \n> me is how git-core and cogito use different branch representations.\n> \n> For the larger part of my day, however, I'm looking into using git as a \n> personal tool in a very large corporate project; This project is \n> currently controlled using subversion, and my idea is to use git as a \n> 'staging' system, where I work (possibly offline) before pushing changes \n> to the upstream (remote, slow as hell) subversion repository. Here, \n> git-svn seems to be my best friend.\n> \n> Any advice to this poor newbie?\n\nI would just stick with core Git.  I haven't used Cogito in almost\na year so I can't say what I'm missing there, but core Git works\nvery well for all of my needs.  I use it in a lot of different\nprojects, some which require git-svn, others which require some\nbastard git-svn-workalike for non-SVN systems, and others which\nare just Git projects and don't have to cooperate with others.\n\nGit has come a long way in terms of user interface.  It still has a\nfew rough edges but I think that there are less rough edges on core\nGit's command line user interface than there are on the Subversion\ncommand line client or the CVS command line client.\n\n-- \nShawn.\n"},{"id":"28608","messageId":"egj73t$80e$1@sea.gmane.org","threadId":"5885","inReplyTo":"20061011150842.GA31298@spearce.org","subject":"Re: core-git and porcelains","fromName":"Pazu","fromEmail":"pazu@pazu.com.br","sentAt":"2006-10-11T16:45:20Z","receivedAt":"2006-10-11T16:45:20Z","isPatch":false,"sender":{"key":"pazu@pazu.com.br","avatar":null},"body":"Shawn Pearce wrote:\n\n> I would just stick with core Git.  I haven't used Cogito in almost\n> a year so I can't say what I'm missing there, but core Git works\n> very well for all of my needs.  I use it in a lot of different\n> projects, some which require git-svn, others which require some\n> bastard git-svn-workalike for non-SVN systems, and others which\n> are just Git projects and don't have to cooperate with others.\n\nThanks for the advice, Shawn. Would you mind expanding on how you work \nwith git-svn, however? Specially, how's your everyday work, and how do \nyou deal with multiple upstream branches.\n\n-- Marcus\n"},{"id":"28609","messageId":"20061011165403.GC31298@spearce.org","threadId":"5885","inReplyTo":"egj73t$80e$1@sea.gmane.org","subject":"Re: core-git and porcelains","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-10-11T16:54:03Z","receivedAt":"2006-10-11T16:54:03Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Pazu <pazu@pazu.com.br> wrote:\n> Shawn Pearce wrote:\n> \n> >I would just stick with core Git.  I haven't used Cogito in almost\n> >a year so I can't say what I'm missing there, but core Git works\n> >very well for all of my needs.  I use it in a lot of different\n> >projects, some which require git-svn, others which require some\n> >bastard git-svn-workalike for non-SVN systems, and others which\n> >are just Git projects and don't have to cooperate with others.\n> \n> Thanks for the advice, Shawn. Would you mind expanding on how you work \n> with git-svn, however? Specially, how's your everyday work, and how do \n> you deal with multiple upstream branches.\n\nI don't use multiple upstream branches in SVN fortunately, but the\ngit-svn documentation suggests there is a way to change the Git\nbranch name from 'refs/remotes/git-svn' to another name such that\nyou can create one Git branch for each remote SVN branch.  Of course\nyou need to set that environment variable before invoking git-svn.\n\nAs for my daily work with git-svn, I run \"git svn fetch\" to fetch any\nchanges that had occurred in SVN along the branch I follow, then if\nany changes did exist I merge them into my Git working branch with\n\"git pull . refs/remotes/git-svn\".  When I'm ready to send stuff\nback up to SVN I do \"git svn dcommit refs/remotes/git-svn..master\",\nwhere master is the name of the Git branch I want to send.\n\n-- \nShawn.\n"},{"id":"28610","messageId":"m2r6xe4wiz.fsf@ziti.local","threadId":"5885","inReplyTo":"20061011150842.GA31298@spearce.org","subject":"Re: core-git and porcelains","fromName":"Seth Falcon","fromEmail":"sethfalcon@gmail.com","sentAt":"2006-10-11T17:01:08Z","receivedAt":"2006-10-11T17:01:08Z","isPatch":false,"sender":{"key":"sethfalcon@gmail.com","avatar":"https://gravatar.com/avatar/fd62fe73d3013b12fce71d5269ec52eaca3c4cee479efc6eea3603d6f1d8bf8d?d=mp&s=160"},"body":"I second Shawn's suggestion to stick with core Git.  I have similar\nuses as you describe: projects where I'm the lone developer and using\ngit to help track projects that use svn.\n\n+ seth\n"},{"id":"28611","messageId":"egj8ot$eq6$1@sea.gmane.org","threadId":"5885","inReplyTo":"20061011165403.GC31298@spearce.org","subject":"Re: core-git and porcelains","fromName":"Pazu","fromEmail":"pazu@pazu.com.br","sentAt":"2006-10-11T17:13:33Z","receivedAt":"2006-10-11T17:13:33Z","isPatch":false,"sender":{"key":"pazu@pazu.com.br","avatar":null},"body":"Shawn Pearce wrote:\n\n> I don't use multiple upstream branches in SVN fortunately, but the\n> git-svn documentation suggests there is a way to change the Git\n> branch name from 'refs/remotes/git-svn' to another name such that\n> you can create one Git branch for each remote SVN branch.  Of course\n> you need to set that environment variable before invoking git-svn.\n\nI was reading git-svn documentation and just found about multi-init. \nSeems like you're describing, execept that no branch get init'ed as the \n\"default\" branch, and you always need to specify the the branch name \nbefore doing a fetch/dcomic/etc. I hope this works for me -- I'll need \nto switch between two or three remote branches quite frequently.\n\n> As for my daily work with git-svn, I run \"git svn fetch\" to fetch any\n> changes that had occurred in SVN along the branch I follow, then if\n> any changes did exist I merge them into my Git working branch with\n> \"git pull . refs/remotes/git-svn\".  When I'm ready to send stuff\n> back up to SVN I do \"git svn dcommit refs/remotes/git-svn..master\",\n> where master is the name of the Git branch I want to send.\n\nSounds a lot like what I do today with svk. If git works for me just as \ngood as svk, the speed increase alone will make the switch worth.\n\n-- Marcus\n"},{"id":"28616","messageId":"200610112008.46873.robin.rosenberg.lists@dewire.com","threadId":"5885","inReplyTo":"egivn8$5mf$1@sea.gmane.org","subject":"Re: core-git and porcelains","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2006-10-11T18:08:46Z","receivedAt":"2006-10-11T18:08:46Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdag 11 oktober 2006 16:39 skrev Pazu:\n[...]\n> For the larger part of my day, however, I'm looking into using git as a\n> personal tool in a very large corporate project; This project is\n> currently controlled using subversion, and my idea is to use git as a\n> 'staging' system, where I work (possibly offline) before pushing changes\n> to the upstream (remote, slow as hell) subversion repository. Here,\n> git-svn seems to be my best friend.\n\nI work against a CVS repo in the way you want to use SVN and I find StGIT\nto be a perfect fit for my needs. StGIT's doesn't replace GIT's command so I \nuse StGIT for it's patch management and the standard git commands for the \nrest.  I can't see that working agains SVN should be any different, except \nthe git-svn* vs git-cvs commands.  \n\nThe GIT commands aren't that hard to understand. The difficulty is to know \nwhich commands to use.  I use these commands\n\nstg init, new, add, remove push, pop, refresh, status, pull, goto, diff (and a \nnew command float that I wrote which simplified some pop-push sequences)\n\ngit log push, diff\n\nIn addition I use qgit for browsing when git log isn't comfortable enough and \noccasionally the standard patch command.\n\n-- robin\n"}]}