Zhentar posted:

I don't know about your particular issue, or the current state of SVN, but historically SVN hasn't handled merging updates to the trunk into branches and then back to the trunk very well. An alternative is to create a new branch from the trunk, and merge your changes from the original branch into the new branch.

floWenoL posted:

You just pretty much described the use case where git really shines. I don't know what awesmoe is smoking but when I tried to do pretty much the same thing you did with svn it sucked pretty hard.

quote:

Also, the latency difference between committing locally vs. committing over the network is nice.

nbv4 posted:

Its gotten to the point where I think I need to start branching. I want to add new features, but don't want to tie up my source in case a bug is discovered in myworking site while the SVN repo is tied up in my developement of a new feature. I head SVN is bad at branching. Should I switch to another program like git or w/e or will SVN be fine?

floWenoL posted:

Not really; it's more like if you use svn you're stuck with doing trivial things with branches because it sucks at anything more.

quote:

Too bad that doesn't apply!

floWenoL posted:

Pretty much the definition of "vague" right there.

quote:

Except that is a solution to a different problem. AFAIK, svn export only exports your working copy and not the version control information (i.e., .svn directories). This may actually be what the OP wants

quote:

If your answer to "git can do X better than svn can" will always be "svn can do <something that's vaguely similar to X but not really the same>" then I might throw a few more at you, just to see what you can come up with.

Janin posted:

There's very little effort involved in switching from SVN to another VCS. Just install the new VCS, fast-import the repository, and archive the SVN version somewhere.

floWenoL posted:

He explicitly asked, "Whats the best source control program for single person projects?" If that's not an invitation to pimp your favorite VCS, I don't know what is.

quote:

I head SVN is bad at branching. Should I switch to another program like git or w/e or will SVN be fine?

quote:

I think you're overestimating the effort of porting a single-person project to another VCS and learning enough to be functional.

Bob Morales posted:

What do teams do to solve the problem of "Does Bill have changes he needs to check in?"

We have people that aren't in this office (or just not in every day), and it'd be nice to be able to go to a website and see that Bill has 2 files he needs to check in and Tom has 3. I guess it'd depend on some sort of client-side program that checks for modified code on a users machine and reports back.

Rohaq posted:

I'm wondering something, out of interest - I've got the following structure in subversion:

code:

/
|-archive
|-main
 |-project1
  |-branches
  |-tags
  |-trunk
 |-project2
  |-branches
  |-tags
  |-trunk

Archive is used to keep a record of older code from yore, and can be ignored, but I really want to enforce the directory structure under main/project - Keep the trunk as our working copy, and keep branches and tags to their respective directories. I'm a little worried that someone might accidentally create their branch in the trunk directory, or similar however. Is there any way to get subversion clients, GUI or CLI, to default branching/tagging to those directories? Even if we have to do this on a per-project basis, it'd be nice to try and get some kind of safety net into place.

uXs posted:

The biggest advantage to a DCVS, to me, is that you commit first, and only then merge.

Thermopyle posted:

A certain type of person doesn't view coding outside of their job as "work". This type of person comes with a set of attributes that many employers would like.

HappyHippo posted:

Is there a good SVN client for mac?

Newf posted:

I've been using TortoiseSVN on Windows to manage some small personal projects. I'm a baby-level user, but it's working well enough.

I want to get better acquainted with the command-line blood and guts of SVN, so I started reading http://svnbook.red-bean.com/. This book seems good and comprehensive and all, and it's improved my operation of TortoiseSVN, but I still haven't gotten to 'the point' - svn isn't in my windows path, so the command line perspective I'm looking to learn isn't available to me.

College Ruled posted:

Unless there is some missing functionality that I am unaware of, Win32SVN is a more lightweight option for a Windows command line SVN.

Marsol0 posted:

I'm going to pitch Atlassian's Stash to my company for git repository management. Is there any reason that this might be a bad idea? They want behind-firewall repo mangement (paranoid about theft or something I don't know and I'm not going to fight it). And since we're using Jira I figured the integration would be nice to have. It's also cheaper than Github Enterprise.

Suspicious Dish posted:

lol, no. It's one of those clones that tries to emulate GitHub as it was three years ago, since it has no independent vision about its featureset or its design.

Mr. Crow posted:

Mr. Crow posted:

I don't really see it as an issue at all.

Hughlander posted:

While I still hate how so many companies use git in a purely non-distributed fashion

Marsol0 posted:

Looks like we're going with this. We want to move to git, but the Director of Development doesn't want to have to go beg for money to move. Thanks for the suggestion.

evensevenone posted:

The regular gitlab is still self-hosted, you don't need enterprise. Also gitlab enterprise is only $20/year/user.

GitHub Enterprise is I think $5k/year/20 users which does seem kind of high but not that unreasonable.

Maluco Marinero posted:

Have something to put to the thread. I've started on a project that uses bower, it feels like an incomplete solution for a number of reasons:

- some packages that aren't immediately ready for use, what's the point
- no support for dependencies which have custom builds where you pick and choose the feature set
- no packaging sets of dependencies into single files

While I'm not nailing my colours to the mast, I really feel like the solution isn't bower in a lot of cases. What are the options for managing dependencies for a front end project, and what are peoples feelings on commuting these dependencies into the version control, especially for stripped custom builds.

This is more or less focused on JavaScript projects, where it seems the workflows are pretty early stages at this point.

Ciaphas posted:

Speaking as a mostly clueless newbie to version control*, how would I want to go about picking a version control system to actually use for our team?

We have a very small team, about 1-3 people ever actually coding, we're mostly in maintenance mode code-wise at this point, and our dev machines will never see the internet. Our only real requirement is that we be able to point at a particular tagged release and say "this is where we finished these features/bugfixes". With those minimal requirements I have no idea what's suitable without being Too Damned Much, having hosed around enough to know the very basics of using svn, hg, and git.

^{_{* I ended up as the Clearcase guy for our team these past five years and I hate it, but I learned by trial rather than teaching so I might be biased. Nice conflict merge tools though, I think}}

Ciaphas posted:

(edit) Oh lord, did I just step on a highly over-opinionated land mine?

wwb posted:

Didn't we have this debate a few pages ago. Anyhow, that is a strong statement, care to back it up?

Opinion Haver posted:

I agree, anything that anybody has ever been confused by is an unworkable system.

Plorkyeran posted:

go back to yospos old man

Strong Sauce posted:

git is more confusing than it should be but I would take git over svn. svn is the worst.

Gul Banana posted:

git is more complex than svn and has more features than svn