It appears that the functionality of the Forest Extension is being implemented into core Mercurial (as of 1.3):

[https://www.mercurial-scm.org/wiki/Subrepository][1].

Currently marked as &quot;experimental&quot; but perhaps will be the route to handle svn:external -type functionality as of v1.4.


  [1]: https://www.mercurial-scm.org/wiki/Subrepository

There&#39;s no good way to do it using mercurial only. The Forest Extension mentioned elsewhere causes more problems that in fixes nowadays.  Most folks just use a large repo and include all their components in the repo and then have their build scripts download and use 3rd party libraries -- using maven if they&#39;re Java-heads.

Short answer &quot;fake it in your build process&quot;.

**Update:**

In Mercurial 1.3 a new sub repos feature was added.  it&#39;s like the old forest extension, but started as all new code.

[Subrepos][1] are considered a &quot;**feature of last resort**&quot;.


  [1]: https://www.mercurial-scm.org/wiki/Subrepository

Have you tried [Deps Extension][1] ?

It&#39;s not part of Mercurial, but seems to mimic `svn:externals` feature 


  [1]: https://www.mercurial-scm.org/wiki/DepsExtension

Try Mercurial&#39;s [Forest Extension][1].


  [1]: https://www.mercurial-scm.org/wiki/ForestExtension

I would be interested to learn about large scale development in Python and especially in how do you maintain a large code base?

  - When you make incompatibility changes to the signature of a method, how do you find all the places where that method is being called. In C++/Java the compiler will find it for you, how do you do it in Python?

  - When you make changes deep inside the code, how do you find out what operations an instance provides, since you don&#39;t have a static type to lookup?

  - How do you handle/prevent typing errors (typos)?

  - Are UnitTest&#39;s used as a substitute for static type checking?

As you can guess I almost only worked with statically typed languages (C++/Java), but I would like to try my hands on Python for larger programs. But I had a very bad experience, a long time ago, with the clipper (dBase) language, which was also dynamically typed.




How can I use Python for large scale development?

How do I get the inverse of a matrix in python? I&#39;ve implemented it myself, but it&#39;s pure python, and I suspect there are faster modules out there to do it.

Python Inverse of a Matrix

We are considering a move from SVN to Mercurial, and have encountered a stumbling block.

We currently use `svn:externals` to automatically pull a common set of libraries into the working directory. I can&#39;t find support for anything like this in Mercurial.

Is there a way to do this automatically with Mercurial, or do I need to fake it as part of my build process?

Can I emulate svn:externals using mercurial?

We are considering a move from SVN to Mercurial, and have encountered a stumbling block.
We currently use <code>svn:externals</code> to automatically pull a common set of libraries into the working directory. I can't find support for anything like this in Mercurial.
Is there a way to do this automatically with Mercurial, or do I need to fake it as part of my build process?

First, I know about this: https://stackoverflow.com/questions/51217/how-would-you-organize-a-subversion-repository-for-in-house-software-projects
Next, the actual question:
My team is restructuring our repository and I&#39;m looking for hints on how to organize it. (SVN in this case).
Here&#39;s what we came up with. We have one repository, multiple projects and multiple svn:externals cross-references

    \commonTools /*tools used in all projects. Referenced in each project with svn:externals*/
       \NUnit.v2.4.8
       \NCover.v.1.5.8
       \&lt;other similar tools&gt;
    \commonFiles /*settings strong name keys etc.*/
       \ReSharper.settings
       \VisualStudio.settings
    \trash /*each member of the team has trash for samples, experiments etc*/
       \user1
       \user2
    \projects
       \Solution1 /*Single actual project (Visual Studio Solution)*/
          \trunk
             \src
                 \Project1 /*Each sub-project resulting in single .dll or .exe*/
                 \Project2
             \lib
             \tools
             \tests
             \Solution1.sln
          \tags
          \branches
       \Solution2
          \trunk
             \src
                 \Project3 /*Each sub-project resulting in single .dll or .exe*/
                 \Project1 /*Project1 from Solution1 references with svn:externals*/
             \lib
             \tools
             \tests
             \Solution2.sln
          \tags
          \branches

To clear the vocabulary: Solution means single product, Project is a Visual Studio Project (that results in a single .dll or single .exe)

That&#39;s how we plan to lay out the repository. The main issue is, that we have multiple Solutions, but we want to share Projects among Solutions.
We thought that there is no point really in moving those shared Projects to their own Solutions, and instead we decided to use svn:externals to share Projects among Solutions. We also want to keep common set of tools and 3rd party libraries in one place in the repository, and them reference them in each Solution with svn:externals.

What do you think about this layout? Especially about the use of svn:externals. It&#39;s not an ideal solution, but considering all pros and cons, it&#39;s the best we could think of. How would YOU do it?

How do you organize your version control repository?

Yesterday, I discovered the Subversion (SVN) [blame][1] feature, and I was wondering, is this feature available from Eclipse?

  [1]: http://theadmin.org/articles/subversion-blame/


SVN blame in Eclipse

Does anybody know a way to recursively remove all files in a working copy that are not under version control? (I need this to get more reliable results in my automatic build VMware.)



Automatically remove Subversion unversioned files

I have a project that I am building with Netbeans 6.1 and I am using SVN. I deleted some files on the local machine then attempted to commit my changes to th SVN repository. The commit fails with the error message

&gt; Entry for &#39;C:\path\to\project\myfile&#39; has no URL

Where myfile is the deleted file.

Is there some way to tell SVN that the file was deleted from the project and that it should be deleted from the repository?

SVN commit error after deleting files locally

I&#39;ve used both SVN and CVS a little bit, but will need to choose one for a new project I will be starting.

Can anyone who has used both extensively please offer some pros and cons and which they think is better?  Best learning resources would be appreciated too.

This will be for a small project, just one or two developers to start.

Subversion vs CVS

Here are two different questions but I think they are related.

1. When using Git, how do I find which changes I have committed locally, but haven&#39;t yet pushed to a remote branch? I&#39;m looking for something similar to the Mercurial command `hg outgoing`.

2. When using Git, how do I find what changes a remote branch has prior to doing a pull? I&#39;m looking for something similar to the Mercurial command `hg incoming`.

For the second: is there a way to see what is available and then cherry-pick the changes I want to pull?

Using Git how do I find changes between local and remote

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?

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

Subversion lets you embed working copies of other repositories using [externals][1], allowing easy version control of third-party library software in your project.

While these seem ideal for the reuse of libraries and version control of [vendor software][2], they aren&#39;t without [their critics][3]:

&gt;Please don&#39;t use Subversion externals (or similar in other tools), they are an anti-pattern and, therefore, unnecessary

Are there hidden risks in using externals? Please explain why they would they be considered an antipattern.


  [1]: http://svnbook.red-bean.com/en/1.1/ch07s04.html
  [2]: http://svnbook.red-bean.com/en/1.1/ch07s05.html
  [3]: https://stackoverflow.com/questions/222827/how-do-you-organize-your-version-control-repository#304036

Are subversion externals an antipattern?

I&#39;m looking for a succinct and well-written tutorial on using svn:externals.  

I already know how to use them in a basic way myself, but I want a good article that I can link to when answering questions like this one that come up recently: 
 
&lt;https://stackoverflow.com/questions/662898/what-to-do-with-multiple-projects-depend-on-the-same-source/662905&gt;

I&#39;d do it myself, but I don&#39;t use them often enough to want to stick my neck out and write a tutorial on it.  Google was surprisingly unhelpful with this topic.


Content Type	Original Author	Original Content on Stackoverflow
Question	Eltariel	View Question on Stackoverflow
Solution 1 - Svn	Nick Pierpoint	View Answer on Stackoverflow
Solution 2 - Svn	Ry4an Brase	View Answer on Stackoverflow
Solution 3 - Svn	yanjost	View Answer on Stackoverflow
Solution 4 - Svn	sanxiyn	View Answer on Stackoverflow

Can I emulate svn:externals using mercurial?

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Solution 2 - Svn

Solution 3 - Svn

Solution 4 - Svn

Python Inverse of a Matrix

How can I use Python for large scale development?

Attributions