<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On 15 Jun 2010, at 16:24, Eric Seidel wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div><blockquote type="cite">Do you have experience with branches in git? Is it easier to use <br></blockquote><blockquote type="cite">branches, or to have separate repositories and push/pull changes in <br></blockquote><blockquote type="cite">between?<br></blockquote><br>I thought that the ease of branching/merging was one of the major selling points of git, but idk if branches would be the preferable method for indicating a stable release (I don't see why not). My question is can you specify a specific branch in the URL as you can in cvs/svn. </div></blockquote><div><br></div><div>I don't think you can specify the branch in the URL. After it is cloned, you need to do "git checkout <branchname>" in the repo directory. </div><div><br></div><blockquote type="cite"><div>I think it would be best if we had 2 thornlists, one for the stable release, and one for development. To me this approach makes more sense because in general we can't guarantee that all stable branches will have the same tag, so doing some clever tricks within GetComponents wouldn't work as well.<br></div></blockquote><div><br></div><div>Yes, I agree.</div><br><blockquote type="cite"><div>As far as branching with GetComponents goes, it doesn't do anything beyond checking out from a URL. So branching would work for cvs/svn, but possibly not for git (I'll have to look into that a bit)<br></div></blockquote><blockquote type="cite"><div><font class="Apple-style-span" color="#000000"><br></font>On another note, there is a bug in GetComponents that I'm planning to address a bit later today. We're trying to merge all the git-repos/hg-repos etc into one repos folder, but it causes an error if you try to update ET with the newest version of GetComponents from last night. So I would recommend either doing a clean checkout of ET, or wait until a bit later today and I'll try to have GetComponents make the change a bit more elegantly.<br><br><br>Eric</div></blockquote></div><br><div apple-content-edited="true"> <span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>-- </div><div>Ian Hinder</div><div><a href="mailto:ian.hinder@aei.mpg.de">ian.hinder@aei.mpg.de</a></div></div></span></div></span></div></span> </div><br></body></html>