1 karma · joined May 19, 2022
We recently migrated our WordPress instance to a new machine, but not all of the configuration was moved over. We've put caching back in place, so it should be back to normal.
Substantiating your claims can only make your position more legitimate. It's hard to take this seriously based on hearsay.
I completely agree that UI's something we need to improve on. I do think we've been making progress: We recently redesigned the commit history page, we've cleaned up the repository and account admin pages, and we've been updating the whole site with a more streamlined look and feel.
One of the next big things on our roadmap is redoing the repository header (that thing with all the tabs and buttons). And personally, I'd like to see us standardize on a single repo landing page with everything you need, but that's a little controversial at the moment. :)
We're huge fans of defunkt's pjax library, so expect to see it used more on the site in the future - including in the source browser.
Oh, and we're currently looking for a designer! http://www.atlassian.com/about/careers/listing.jsp?jobID=143
However, if it is a direct descendent, it will try to merge for you:
$ echo b >> a
$ hg status
M a
$ hg pull ../a
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
$ hg update
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
$ hg resolve -l
U a
In this example, the upstream repository made a change to "a" that conflicts with my local, uncommitted change to the same file. It uses its normal merge machinery to try to resolve the conflict.As far as I know, Git doesn't allow merges in this situation.
The author could've given an example like this where he got a conflict and that would still be an infinitely better outcome than what Subversion's doing. You'd actually know that there are changes that you need to reconcile, instead of it silently succeeding.
He's not missing the point.
Mood, anxiety, and personality disorders also frequently occur along with ADHD[2].
[1]: http://www.webmd.com/add-adhd/guide/types-of-adhd
[2]: http://www.mayoclinic.com/health/adult-adhd/DS01161/DSECTION...
See: http://news.ycombinator.com/item?id=117171 http://news.ycombinator.com/item?id=392347
That, and the amount of bike shedding going on the dev mailing lists is ridiculous. At least it seemed that way the last time I kept up with it. So much pointless circular discussion.
1. Both Mercurial and Git use the same history model; both have DAGs and changesets.
2. The dirstate is an internal format, and it's analogous to Git's index. You are right though, that Git allows you to manage it manually is a big difference from Mercurial.
I think Mercurial tends to be more conservative in what it allows; it discourages history editing, and it tries to be similar to Subversion and CVS in terms of UI. Git, on the other hand, provides all the power user features - like commit amendment, rebasing, and index management - up front.
If you're intent on building from source, make sure you're running "sudo python setup.py install; sudo make install-doc". Installing with the makefile directly will place packages in /usr/local, where Python doesn't normally live under OS X.
"The following lists some types of extensions that we'd like to eventually support:"
[...]
* "Content filtering: Adblock, Flashblock, Privacy control, Parental control"
Is crippling the console's built-in functionality - which is unrelated to Xbox Live - a fair move? I would imagine the TOS to be irrelevant in that case, since it's not related to their online service.
Isn't this the exact opposite of creating a new syntax? You could level your same arguments against XML when it was introduced to browsers through XHTML.
I can't tell if you're sarcastically lambasting HTML 5 or if you're mocking its detractors. Could you elaborate?
This is important when you're working with more than just your own code. It's like a forced style guideline, and it gets even better when everyone conforms to Python's other optional style guidelines. It reduces friction.
Personally I'd like to hear some video game-style level up music whenever I climb to the top.