I&#39;ve solved this using a Mercurial built-in extension... I just have to add the following lines to Mercurial.ini (on Mercurial folder):

    [extensions]
    hgext.extdiff=
    
    [extdiff]
    cmd.vdiff = kdiff3

When I want to use kdiff3 instead of diff I only have to use:

    hg vdiff file.ext

With this config

    [extdiff]
    cmd.kdiff3 =

I use this command to see diffs:

    hg kdiff

This shows a directory tree with all files that have changed.  You click a file to see diffs for just the file.  You may be able to add a file parameter to the command to just see one file.

More info [here][1].


  [1]: https://www.mercurial-scm.org/wiki/KDiff3

If you are looking for something like `git difftool`, where you don&#39;t need to type the filenames and see the diff for all changed files, add these to your `~/.hgrc`, and run `hg difftool`.

    [extensions]
    extdiff =

    [extdiff]
    cmd.vimdiff = vimdiff

    [alias]
    difftool = !for file in $(hg status -n); do hg vimdiff $file; done

or for windows:

    [alias]
    difftool = !FOR /f %F IN (&#39;hg status -nmar&#39;) DO hg vimdiff %F

I just had this problem a few minutes ago; I just installed it and added its path (default is at c:\program files\kdiff3) to my system PATH e.v. Restarted my window to pick up the new path, and &quot;hg kdiff3&quot; just worked. As it turns out the following is in my base &quot;mercurial.ini&quot; file, this allows the kdiff3 to work for all hg repos on the system.

    [extensions]  
    hgext.extdiff =  

    [extdiff]  
    cmd.kdiff3 =

    [merge-tools]  
    kdiff3.args = $base $local $other -o $output


I want to read line n1-&gt;n2 from file foo.c into the current buffer.

I tried: `147,227r /path/to/foo/foo.c`

But I get: &quot;E16: Invalid range&quot;, though I am certain that foo.c contains more than 1000 lines.


vim -- How to read range of lines from a file into current buffer

In some code I&#39;ve inherited, I see frequent use of `size_t` with the `std` namespace qualifier.  For example:

    std::size_t n = sizeof( long );

It compiles and runs fine, of course.  But it seems like bad practice to me (perhaps carried over from C?).

Isn&#39;t it true that `size_t` is built into C++ and therefore in the global namespace?  Is a header file include needed to use `size_t` in C++?

Another way to ask this question is, would the following program (with *no* includes) be expected to *compile* on all C++ compilers?

    size_t foo()
    {
        return sizeof( long );
    }



Does &quot;std::size_t&quot; make sense in C++?

Every time I do an `hg diff file.ext` I end up using a console diff application. I would like to use Kdiff3 or WinMerge (I&#39;m using Windows).

Is there a way to change that? I can&#39;t find a reference in Mercurial documentation (**I&#39;m not talking about merge!**). 


Is possible to change the default diff tool in Mercurial?

Every time I do an <code>hg diff file.ext</code> I end up using a console diff application. I would like to use Kdiff3 or WinMerge (I'm using Windows).
Is there a way to change that? I can't find a reference in Mercurial documentation (I'm not talking about merge!).

I need to use different database connection string and SMTP server address in my ASP.NET application depending on it is run in development or production environment. 

The application reads settings from Web.config file via [WebConfigurationManager.AppSettings][1] property.

I use Build/Publish command to deploy the application to production server via FTP and then manually replace remote Web.config with correct one.

Is it possible somehow simplify the process of deployment? Thanks!


  [1]: http://msdn.microsoft.com/en-us/library/system.web.configuration.webconfigurationmanager.appsettings.aspx

Using different Web.config in development and production environment

When I get a vanilla Windows system, there&#39;s a bunch of stuff I change to make it more developer-friendly.

Some of it I remember every time, other stuff I only do as and when.

Examples:

 - Show extensions of all file types
 - Make hidden and system file visible
 - Turn off Windows Defender

I seem to remember a blog post from Jeff on this topic, but can&#39;t locate it!

What else do you do, and do you have any tools that automate this process?


As a developer, what changes do you make to a vanilla Windows install?

I&#39;d like to set a connection string programmatically, with absolutely no change to any config files / registry keys.

I have this piece of code, but unfortunately it throws an exception with &quot;the configuration is read only&quot;.

    ConfigurationManager.ConnectionStrings.Clear();
    string connectionString = &quot;Server=myserver;Port=8080;Database=my_db;...&quot;;
    ConnectionStringSettings connectionStringSettings = 
      new ConnectionStringSettings(&quot;MyConnectionStringKey&quot;, connectionString);
    ConfigurationManager.ConnectionStrings.Add(connectionStringSettings);

**Edit:**
The problem is that I have existing code that reads the connection string from the configuration. So setting the config string manually, or through a resource, don&#39;t seem like valid options. What I really need is a way to modify the configuration programmatically.

How do I set a connection string config programmatically in .net?

Here&#39;s a standard scenario:

    if(string.IsNullOrEmpty(Configuration.AppSettings[&quot;foobar&quot;]))
       throw new SomeStandardException(&quot;Application not configured correctly, bozo.&quot;);

The problem is, I am not entirely certain *which* exception `SomeStandardException` should be. 

I perused the 3.5 Framework and found two likely candidates: [`ConfigurationException`][1] and [`ConfigurationErrorsException`][2].

&gt; &lt;h2&gt;System.Configuration.ConfigurationException&lt;/h2&gt;
&gt; 
&gt; The exception that is thrown when a
&gt; configuration system error has
&gt; occurred.
&gt; 
&gt; &lt;h3&gt;Remarks&lt;/h3&gt; The
&gt; `ConfigurationException` exception is
&gt; thrown if the application attempts to
&gt; read or write data to the
&gt; configuration file but is
&gt; unsuccessful. Some possible reasons
&gt; for this can include malformed XML in
&gt; the configuration file, file
&gt; permission issues, and configuration
&gt; properties with values that are not
&gt; valid.
&gt; 
&gt; **Note:**
&gt; 
&gt; The `ConfigurationException` object is
&gt; maintained for backward compatibility.
&gt; The `ConfigurationErrorsException`
&gt; object replaces it for the
&gt; configuration system.

This exception actually sounds perfect for what I need, but it&#39;s been marked obsolete, so, ixnay on atthay.

This brings us to the thoroughly puzzling [`ConfigurationErrorsException`][3]:

&gt; &lt;h2&gt;System.Configuration.ConfigurationErrorsException&lt;/h2&gt;
&gt; 
&gt; The current value is not one of the
&gt; EnableSessionState values.

As you can see, its documentation is completely useless. (It&#39;s that way in both local and online help.) An examination of the class itself shows that it&#39;s drastic overkill for what I want. 

In a nutshell, I need a standard exception that should be thrown when an application configuration setting is missing or contains an invalid value. You&#39;d think the Framework had such an exception baked into it for applications to use. (It apparently did, but it was marked obsolete, and was replaced by something *much* larger in scope.)

What solutions, if any, are you guys using for this, and am I going to have to suck it up and roll my own exception for this?

&lt;h2&gt;Edit Addenda&lt;/h2&gt;
Some have asked whether or not I could provide a default value, and continue. In certain cases, yes, and in those cases, the exception would not be thrown. However, for certain settings, this won&#39;t apply. For instance: database server names and credentials, authentication servers, and paths to installed third party applications. 

It is also worth noting that the application I&#39;m primarily working on is a console application running in batch mode, and I want it to throw an exception that is caught by the main method and logged appropriately if the thing isn&#39;t appropriately configured. (It&#39;s legacy code I&#39;ve inherited, and currently just *assumes* everything&#39;s peachy.)


  [1]: http://msdn.microsoft.com/en-us/library/system.configuration.configurationexception.aspx
  [2]: http://msdn.microsoft.com/en-us/library/system.configuration.configurationerrorsexception.aspx
  [3]: http://msdn.microsoft.com/en-us/library/system.configuration.configurationerrorsexception.aspx

.NET: Which Exception to Throw When a Required Configuration Setting is Missing?

I haven&#39;t been able to find any documentation on how to configure Hibernate&#39;s logging using the XML style configuration file for Log4j.

Is this even possible or do I have use a properties style configuration file to control Hibernate&#39;s logging?

If anyone has any information or links to documentation it would appreciated.

**EDIT:**&lt;br/&gt;
Just to clarify, I am looking for an example of the actual XML syntax to control Hibernate.

**EDIT2:**&lt;br/&gt;
Here is what I have in my XML config file.

    &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
    &lt;!DOCTYPE log4j:configuration SYSTEM &quot;log4j.dtd&quot;&gt;

    &lt;log4j:configuration xmlns:log4j=&quot;http://jakarta.apache.org/log4j/&quot;&gt;
        &lt;appender name=&quot;console&quot; class=&quot;org.apache.log4j.ConsoleAppender&quot;&gt;
            &lt;param name=&quot;Threshold&quot; value=&quot;info&quot;/&gt;
            &lt;param name=&quot;Target&quot; value=&quot;System.out&quot;/&gt;
            &lt;layout class=&quot;org.apache.log4j.PatternLayout&quot;&gt;
                &lt;param name=&quot;ConversionPattern&quot; value=&quot;%d{ABSOLUTE} [%t] %-5p %c{1} - %m%n&quot;/&gt;
            &lt;/layout&gt;
        &lt;/appender&gt;
        &lt;appender name=&quot;rolling-file&quot; class=&quot;org.apache.log4j.RollingFileAppender&quot;&gt;
            &lt;param name=&quot;file&quot; value=&quot;Program-Name.log&quot;/&gt;
            &lt;param name=&quot;MaxFileSize&quot; value=&quot;1000KB&quot;/&gt;
        &lt;!-- Keep one backup file --&gt;
            &lt;param name=&quot;MaxBackupIndex&quot; value=&quot;4&quot;/&gt;
            &lt;layout class=&quot;org.apache.log4j.PatternLayout&quot;&gt;
                &lt;param name=&quot;ConversionPattern&quot; value=&quot;%d [%t] %-5p %l - %m%n&quot;/&gt;
            &lt;/layout&gt;
        &lt;/appender&gt;

        &lt;root&gt;
            &lt;priority value =&quot;debug&quot; /&gt;
            &lt;appender-ref ref=&quot;console&quot; /&gt;
            &lt;appender-ref ref=&quot;rolling-file&quot; /&gt;
        &lt;/root&gt;
    &lt;/log4j:configuration&gt;

Logging works fine but I am looking for a way to step down and control the hibernate logging in way that separate from my application level logging, as it currently is flooding my logs. I have found examples of using the preference file to do this, I was just wondering how I can do this in a XML file.

Configuring Hibernate logging using Log4j XML config file?

I am looking for an expression for the .hgignore file, to ignore all files beneath a specified folder.

eg: I would like to ignore all files and folders beneath bin

Actually any advice on how the expressions are formed would be great

How can I ignore everything under a folder in Mercurial

I have a largish Mercurial repository that I&#39;ve decided would be better as several smaller repositories.  Is there a way that I can split the repository and have each piece retain its revision history?

Can I split a Mercurial repository?

How do you reverse the effect of a merge on polarised branches without dying of agony?

This problem has been plaguing me for **months** and I have finally given up. 


You have 1 Repository, with 2  **Named** Branches.  A and B. 

Changes that occur to A will inevitably occur on B. 

Changes that occur directly on B MUST NEVER occur on A. 

In such a configuration, merging &quot;B&quot; into &quot;A&quot; produces a dire problem in the repository, as all the changes to B appear in A as if they were made in A. 

The only &quot;normal&quot; way to recover from this situation appears to be &quot;backing out&quot; the merge, ie: 

     hg up -r A 
     hg backout -r BadMergeRev --parent BadMergerevBeforeOnA 

Which looks all fine and dandy, until you decide to merge later in the correct direction, and you end up with all sorts of nasty things happening and code that was erased / commented out on specifically branch B suddenly becomes unerased or uncommented. 

There has not been a working viable solution to this so far other than &quot;let it do its thing, and then hand fix all the problems&quot; and that to be honest is a bit fubar.  

Here is an image clarifying the problem: 

*[Original image lost]*

Files C &amp; E ( or changes C &amp; E ) must appear only on branch b, and not on branch a.
Revision A9 here ( branch a, revno 9 ) is the start of the problem. 

Revisions A10 and A11 are the &quot;Backout merge&quot; and &quot;merge the backout&quot; phases. 

And revision B12 is mercurial, erroneously repeatedly dropping a change that was intended  not to be dropped. 

This Dilemma has caused much frustration and blue smoke and I would like to put an end to it. 

&lt;h3&gt;Note&lt;/h3&gt; 
It may be the obvious answer to try prohibiting the reverse merge from occurring, either with hooks or with policies, I have found the ability to muck this up is rather high and the chance of it happening so likely that even with countermeasures, you *must* still assume that inevitably, it *will* happen so that you can solve it when it does.

&lt;h3&gt;To Elaborate&lt;/h3&gt;
In the model I have used Seperate files. These make the problem sound simple. These merely represent *arbitrary changes* which could be a separate line. 

Also, to add insult to injury, there have been substantial changes on branch A which leaves the standing problem &quot;do the changes in branch A conflict with the changes in branch B which just turned up ( and got backed out ) which looks like a change on branch A instead &quot; 

&lt;h3&gt;On History Rewriting Tricks:&lt;/h3&gt;
The problem with all these retro-active solutions is as follows:

   1. We have 9000 commits. 
   2. Cloning freshly thus takes half an hour
   3. If there exists *even one* bad clone of the repository *somewhere*, there is a liklihood of it comming back in contact with the original repository, and banging it up all over again. 
   4. Everyone has cloned this repository already, and now several days have passed with on-going commits.
   5. One such clone, happens to be a live site, so &quot;wiping that one and starting from scratch&quot; = &quot;big nono&quot; 

( I admit, many of the above are a bit daft, but they are outside of my control ). 

The only solutions that are viable are the ones that assume that people *can* and *will* do everything wrong, and that there is a way to &#39;undo&#39; this wrongness. 



Backing Out a backwards merge on Mercurial

I&#39;ve decided that I want to use Mercurial for a small, personal project.  

Most of the help I&#39;ve read about it talks about merging changes between multiple users.  Since I&#39;m solo, that&#39;s not going to happen.

Should I have multiple repositories?  My development computer is already backed up nightly to my Windows Home Server, so it doesn&#39;t seem valuable to have a second repository elsewhere just for backup purposes.

Should I be branching every day?  Or just around releases? Or when?

In general, what practices do you recommend for the lone developer using Mercurial?



How should I use Mercurial as a lone developer?

I want to know how to simply publish over http = much like [Mercurial][1]&#39;s hg serve! On the Windows/work box do this:

    git serve 

and then on the Linux box SIMPLY go:

    git clone http://project project 

finished. 

  [1]: http://en.wikipedia.org/wiki/Mercurial


Git serve: I would like it that simple

When I type `git diff`, I want to view the output with my visual diff tool of choice (SourceGear &quot;diffmerge&quot; on Windows). How do I configure git to do this?



How do I view &#39;git diff&#39; output with my preferred diff tool/ viewer?

The scenario is:

 1. svn cp or mv some file
 2. modify that file
 3. svn diff &gt; mypatch

On other machine (same working copy, but no changes):

 4. Try to apply mypatch.
 5. Fail -&gt; tries to modify unexistant file.

How can I make svn diff produce patch-appliable patch, or cleanly apply patch produced by svn diff in this case? I can&#39;t commit. I would like to preserve mergeinfo (because the obvious workaround is to add the file as totally new, without connection to the previous one).

How to make svn diff produce file that patch would apply, when svn cp or svn mv was used?

What is the easiest way to highlight the difference between two strings in PHP?

I&#39;m thinking along the lines of the Stack Overflow edit history page, where new text is in green and removed text is in red. If there are any pre-written functions or classes available, that would be ideal.

Highlight the difference between two strings in PHP

How can you &lt;a href=&quot;http://en.wikipedia.org/wiki/Diff&quot;&gt;diff&lt;/a&gt; two pipelines without using temporary files in Bash?  Say you have two command pipelines:

    foo | bar
    baz | quux

And you want to find the `diff` in their outputs.  One solution would obviously be to:

    foo | bar &gt; /tmp/a
    baz | quux &gt; /tmp/b
    diff /tmp/a /tmp/b

Is it possible to do so without the use of temporary files in Bash?  You can get rid of one temporary file by piping in one of the pipelines to diff:

    foo | bar &gt; /tmp/a
    baz | quux | diff /tmp/a -

But you can&#39;t pipe both pipelines into diff simultaneously (not in any obvious manner, at least).  Is there some clever trick involving `/dev/fd` to do this without using temporary files?

How can you diff two pipelines in Bash?

I&#39;d like to use my own diff when working in a clearcase snapshot view.  

As far as I can see, there is no way to specify a diff tool when running &quot;`cleartool diff`&quot;, so I was thinking I could run something like &quot;`mydiff &lt;predecessor file&gt; &lt;modified file in my view&gt;`&quot;, but I don&#39;t know enough about ClearCase to be able to find the &quot;predecessor file&quot; to diff against.  

Any way to do this?

Forgot to mention (until now, after reading the first two responses dealing with windows) that this is on Unix, and I am not allowed to muck with the ClearCase configuration.

Content Type	Original Author	Original Content on Stackoverflow
Question	Tute	View Question on Stackoverflow
Solution 1 - Configuration	Tute	View Answer on Stackoverflow
Solution 2 - Configuration	Marcus Leon	View Answer on Stackoverflow
Solution 3 - Configuration	musa	View Answer on Stackoverflow
Solution 4 - Configuration	Ken	View Answer on Stackoverflow

Is possible to change the default diff tool in Mercurial?

Configuration Problem Overview

Configuration Solutions

Solution 1 - Configuration

Solution 2 - Configuration

Solution 3 - Configuration

Solution 4 - Configuration

Does "std::size_t" make sense in C++?

vim -- How to read range of lines from a file into current buffer

Attributions