News for hackers. Stuff that matters.
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by chaz72 on Friday February 27, 2015 @04:55PM (#9121614)
I have been wondering whether to go back to Subversion myself. The distributed option really doesn't apply to me, my minimal branching needs are met by Subversion, and oh my god, git's submodules get confusing.
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by gecko on Friday February 27, 2015 @05:56PM (#9121911)
(Author here)

To be clear, in real life, I do not actually like Subversion. I use Mercurial pretty exclusively for my own stuff, and would indeed use some of the centralized Mercurial extensions I linked in the article (e.g., remotefilelog, narrowhg, etc.) to scale upward if I had really big stuff flying around. The article is more about pointing out that going to a DVCS involves trade-offs, acknowledging that we have a lot of tooling designed to fake out those trade-offs, and discourage thinking of DVCS as a strict upgrade rather than an engineering decision with implications and costs and benefits.

Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by chaz72 on Saturday February 28, 2015 @12:34PM (#9124343)
Oh, no doubt Subversion has its downsides and Mercurial is really good at what it does. I was just musing through my own tradeoffs. It is a very narrow point but one that I hope is in the spirit of the article.

Partial repo checkouts, SVN externals are the two areas where I feel I lost something when "upgrading" to Git. So yes, I quite agree, there are definitely tradeoffs.

Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by liveoneggs on Friday February 27, 2015 @10:55PM (#9122731)
why are you using submodules if your needs are simple?
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by chaz72 on Saturday February 28, 2015 @12:36PM (#9124346)
Dependencies from other repos. Is there a better way that's the equivalent of a Subversion external?
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by Mathiasdm on Monday March 02, 2015 @05:20AM (#9131195)
One alternative to consider is Mercurial (which command-line wise is more similar to Subversion) with subrepos (which have better usability): http://www.selenic.com/hg/help/subrepos
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by chaz72 on Tuesday March 03, 2015 @11:31AM (#9138543)
Thanks, I will look into this.
Re:Unorthodocs: Abandon Your DVCS and Return to Sanity by liveoneggs on Saturday February 28, 2015 @11:07PM (#9126005)
I would just import them directly like a vendor branch.

http://marc.info/?l=git&m=119495815518898&w=2

It works like this: (I just did this test)

#inside of your repo

git remote add vendor $vendor.git

git fetch vendor #grab their code

git merge vendor/master #imports their code into your repo

git mv vendorlib lib #move it where you want

git fetch vendor #grab the next version

git merge vendor/master #git remembers your mv from before

*update

of course since this is git there is yet-another-command called git read-tree to do a lot of this.

It's all described here: http://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging