troter

--- rails-4-2-stable_initialzer.txt    2015-03-23 18:02:56.000000000 +0900
+++ rails-master_initializer.txt      2015-03-23 18:03:30.000000000 +0900
@@ -9,10 +9,11 @@
   -- action_mailer.logger       before: after:
   -- action_mailer.set_configs  before: after:action_mailer.logger
   -- action_view.caching        before: after:action_view.set_configs
+  -- action_view.collection_caching     before: after:action_view.caching
   -- action_view.embed_authenticity_token_in_remote_forms       before: after:
   -- action_view.logger before: after:action_view.embed_authenticity_token_in_remote_forms
   -- action_view.set_configs    before: after:action_view.logger

troter

hg diffとgit diffの出力の違い

hg diff:

% hg diff
diff --git a/p.c b/p.c
--- a/p.c
+++ b/p.c
@@ -1,26 +1,25 @@
 #include <stdio.h>

troter

% cat hoge.txt
--- /dev/null
+++ b/new.txt
@@ -0,0 +1,1 @@
+aaa
diff --git a/exist.txt b/exist.txt
index 1d95c52..8bffa50 100644
@@ -0,0 +1,1 @@
-bbbb
+aaaa

troter

# OS X 10.9.2
# CPU 2.3 GHz Intel Core i7
# MEM 16GB 1600 MHz DDR3
 
% hg clone http://selenic.com/hg
% cd hg
 
# hg locate + grep
% for i in $(seq 3); do time (hg locate | xargs grep -n -i ctx.walk > /dev/null) ; done
( hg locate | xargs grep -n -i ctx.walk > /dev/null; )  0.73s user 0.06s system 97% cpu 0.807 total

troter

# HG changeset patch
# User Takumi IINO <[email protected]>
# Date 1367677871 -32400
#      Sat May 04 23:31:11 2013 +0900
# Branch stable
# Node ID 460c0546e96ba7dd670876ff76757286dd67219c
# Parent  a6542a670ece8e13ae7b32ef28e2816d63120524
doc: move to i18n translation source directory

diff --git a/.hgignore b/.hgignore

troter

#!/bin/env python

execfile('./htdocs/reviewboard.wsgi')
from tornado.options import options, define, parse_command_line
import tornado.httpserver
import tornado.ioloop
import tornado.web
import tornado.wsgi

define('port', type=int, default=8080)

troter

    #!python
    ** Mercurial version (2.4+6-35ba170c0f82).  TortoiseHg version (2.6)
    ** Command: 
    ** CWD: C:\ProgramData\Microsoft\Windows\Start Menu\Programs\TortoiseHg
    ** Encoding: cp932
    ** Extensions loaded: hgsubversion, graphlog, rebase, transplant, eol, extdiff, mq, hgbb
    ** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
    ** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
    ** Processor architecture: x64
    ** Qt-4.8.0 PyQt-4.9.1

troter

sys.path += ['.']
extensions += ['sphinxcontrib_rawfiles']

# Files you want to copy
rawfiles = ['CNAME']

troter

$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-lfconvert.t # 16295 (ba42eb722bb3) default

--- c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-lfconvert.t 
+++ c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-lfconvert.t.err 
@@ -51,8 +51,6 @@
   skipping incorrectly formatted tag IncorrectlyFormattedTag!
   skipping incorrectly formatted id invalidhash
   no mapping for id 0123456789abcdef
-  abort: renamed/copied largefile large3 becomes symlink
-  [255]

troter

$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-casefolding.t # 16279 (531e69ff348f)

--- c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t 
+++ c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t.err 
@@ -66,10 +66,17 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo gold > a
   $ hg up
-  a: untracked file differs
-  abort: untracked files in working directory differ from files in requested revision