QuestionId stringlengths 3 8 | QuestionTitle stringlengths 15 149 | QuestionScore int64 1 27.2k | QuestionCreatedUtc stringdate 2008-08-01 18:33:08 2025-06-16 04:59:48 | QuestionBodyHtml stringlengths 40 28.2k | QuestionViewCount int64 78 16.5M | QuestionOwnerUserId float64 4 25.2M ⌀ | QuestionLastActivityUtc stringdate 2008-09-08 19:26:01 2026-01-24 22:40:25 | AcceptedAnswerId int64 266 79.7M | AnswerScore int64 2 30.1k | AnswerCreatedUtc stringdate 2008-08-01 23:40:28 2025-06-16 05:23:39 | AnswerOwnerUserId float64 1 29.5M ⌀ | AnswerLastActivityUtc stringdate 2008-08-01 23:40:28 2026-01-23 17:46:09 | QuestionLink stringlengths 31 36 | AnswerLink stringlengths 31 36 | AnswerBodyHtml stringlengths 35 33k | AnswerBodyPreview stringlengths 35 400 | AllTagIdsCsv stringlengths 2 37 | AllTagNamesCsv stringlengths 2 106 | MergedQuestion stringlengths 74 28.4k | quality_filter stringclasses 10
values | unique_id int64 0 29k | tag_major_lang stringclasses 10
values | MergedQuestion_md stringlengths 60 28.1k | AnswerBodyHtml_md stringlengths 14 29.2k |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
10982475 | View topological heads in TortoiseHg | 7 | 2012-06-11 14:50:12 | <p>I like to check for any outstanding topological heads (<code>hg heads -t</code>), that might need merging, before I start new work. I don't see a way to do that in TortoiseHg using revsets. I don't filter often enough to become a revset poweruser, and they scare me.</p>
<p>Is it possible?</p>
| 1,128 | 326,110 | 2012-06-11 15:00:20 | 10,982,664 | 17 | 2012-06-11 15:00:20 | 63,147 | 2012-06-11 15:00:20 | https://stackoverflow.com/q/10982475 | https://stackoverflow.com/a/10982664 | <p>This can be done using <a href="http://www.selenic.com/hg/help/revsets" rel="noreferrer">revsets</a> in TortoiseHg. To check for unmerged heads, I typically do something like this:</p>
<ol>
<li>Switch to the <code>Revision Details</code> view</li>
<li>Turn on the <code>Filter Toolbar</code></li>
<li>Enter the foll... | <p>This can be done using <a href="http://www.selenic.com/hg/help/revsets" rel="noreferrer">revsets</a> in TortoiseHg. To check for unmerged heads, I typically do something like this:</p> <ol> <li>Switch to the <code>Revision Details</code> view</li> <li>Turn on the <code>Filter Toolbar</code></li> <li>Enter the foll... | 802, 8122 | mercurial, tortoisehg | <h1>View topological heads in TortoiseHg</h1>
<p>I like to check for any outstanding topological heads (<code>hg heads -t</code>), that might need merging, before I start new work. I don't see a way to do that in TortoiseHg using revsets. I don't filter often enough to become a revset poweruser, and they scare me.</p>
... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,200 | mercurial | # View topological heads in TortoiseHg
I like to check for any outstanding topological heads (`hg heads -t`), that might need merging, before I start new work. I don't see a way to do that in TortoiseHg using revsets. I don't filter often enough to become a revset poweruser, and they scare me.
Is it possible? | This can be done using [revsets](http://www.selenic.com/hg/help/revsets) in TortoiseHg. To check for unmerged heads, I typically do something like this:
1. Switch to the `Revision Details` view
2. Turn on the `Filter Toolbar`
3. Enter the following filter: `heads(all()) and not closed()` |
16527125 | How to undo a revert in mercurial | 6 | 2013-05-13 16:45:39 | <p>After I had accidentally added several files with</p>
<pre><code>hg add
</code></pre>
<p>I wanted to revert that with</p>
<pre><code>hg revert --all
</code></pre>
<p>Unfortunatelly I hadn't committed my intended changes so they were reverted as well. Can I get that content back?</p>
| 10,896 | 329,749 | 2013-05-13 16:49:15 | 16,527,171 | 17 | 2013-05-13 16:49:15 | 779,513 | 2013-05-13 16:49:15 | https://stackoverflow.com/q/16527125 | https://stackoverflow.com/a/16527171 | <p>You did not specify the <code>--no-backup</code>, so there should be backup files right next to the actual file.</p>
<p><a href="http://www.selenic.com/mercurial/hg.1.html#revert" rel="noreferrer">Documentation to support this</a></p>
<blockquote>
<p>Modified files are saved with a .orig suffix before reverting.... | <p>You did not specify the <code>--no-backup</code>, so there should be backup files right next to the actual file.</p> <p><a href="http://www.selenic.com/mercurial/hg.1.html#revert" rel="noreferrer">Documentation to support this</a></p> <blockquote> <p>Modified files are saved with a .orig suffix before reverting.... | 802, 12309 | mercurial, revert | <h1>How to undo a revert in mercurial</h1>
<p>After I had accidentally added several files with</p>
<pre><code>hg add
</code></pre>
<p>I wanted to revert that with</p>
<pre><code>hg revert --all
</code></pre>
<p>Unfortunatelly I hadn't committed my intended changes so they were reverted as well. Can I get that cont... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,201 | mercurial | # How to undo a revert in mercurial
After I had accidentally added several files with
```
hg add
```
I wanted to revert that with
```
hg revert --all
```
Unfortunatelly I hadn't committed my intended changes so they were reverted as well. Can I get that content back? | You did not specify the `--no-backup`, so there should be backup files right next to the actual file.
[Documentation to support this](http://www.selenic.com/mercurial/hg.1.html#revert)
> Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup. |
12310131 | Mercurial Merge of Two Named Branches: Working Directory Has No Ancestor | 6 | 2012-09-07 00:12:55 | <p>I have two named branches, SPRINT_009 and SPRINT_010. Some changesets have been committed to SPRINT_009 that I would like to merge into SPRINT_010. I was able to merge the changesets from branch_one back into default without any trouble. I am having problems merging the changesets from branch_one into branch_two.... | 20,516 | 1,233,340 | 2016-07-15 10:34:23 | 12,504,536 | 17 | 2012-09-20 00:10:49 | 1,233,340 | 2016-07-15 10:34:23 | https://stackoverflow.com/q/12310131 | https://stackoverflow.com/a/12504536 | <p>The problem was that I hadn't performed an <code>hg pull</code> before attempting the merge. Normally we do our development on a Windows machine using TortoiseHg. We modified the name of one of our resources on the support branch, from fooBAR to fooBar and ran into the <a href="https://www.mercurial-scm.org/wiki/C... | <p>The problem was that I hadn't performed an <code>hg pull</code> before attempting the merge. Normally we do our development on a Windows machine using TortoiseHg. We modified the name of one of our resources on the support branch, from fooBAR to fooBar and ran into the <a href="https://www.mercurial-scm.org/wiki/C... | 802 | mercurial | <h1>Mercurial Merge of Two Named Branches: Working Directory Has No Ancestor</h1>
<p>I have two named branches, SPRINT_009 and SPRINT_010. Some changesets have been committed to SPRINT_009 that I would like to merge into SPRINT_010. I was able to merge the changesets from branch_one back into default without any trou... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,202 | mercurial | # Mercurial Merge of Two Named Branches: Working Directory Has No Ancestor
I have two named branches, SPRINT_009 and SPRINT_010. Some changesets have been committed to SPRINT_009 that I would like to merge into SPRINT_010. I was able to merge the changesets from branch_one back into default without any trouble. I am h... | The problem was that I hadn't performed an `hg pull` before attempting the merge. Normally we do our development on a Windows machine using TortoiseHg. We modified the name of one of our resources on the support branch, from fooBAR to fooBar and ran into the [mercurial case folding](https://www.mercurial-scm.org/wiki/C... |
6989262 | Discard a local branch in Mercurial before it is pushed | 23 | 2011-08-08 22:15:53 | <p>Many times it happens that I have few commits on my local Hg repository which I don't want to push and sometimes I want to remove the local branch altogether. But I cannot rollback more than one commit which leaves me no choice than creating a new clone and download the whole repository again. This feels stupid, sin... | 18,694 | 450,913 | 2019-02-01 04:30:47 | 6,989,485 | 16 | 2011-08-08 22:40:16 | 60,868 | 2011-08-08 22:40:16 | https://stackoverflow.com/q/6989262 | https://stackoverflow.com/a/6989485 | <p>If you enable the mq extension (bundled with Mercurial), you can use <code>hg strip</code>. Be careful, though, as this will modify the history of your repository. The safe method is to clone your repository up to the revision preceding the creation of the branch you want to discard, then to pull the remaining chang... | <p>If you enable the mq extension (bundled with Mercurial), you can use <code>hg strip</code>. Be careful, though, as this will modify the history of your repository. The safe method is to clone your repository up to the revision preceding the creation of the branch you want to discard, then to pull the remaining chang... | 802, 1879, 3050 | branch, clone, mercurial | <h1>Discard a local branch in Mercurial before it is pushed</h1>
<p>Many times it happens that I have few commits on my local Hg repository which I don't want to push and sometimes I want to remove the local branch altogether. But I cannot rollback more than one commit which leaves me no choice than creating a new clon... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,205 | mercurial | # Discard a local branch in Mercurial before it is pushed
Many times it happens that I have few commits on my local Hg repository which I don't want to push and sometimes I want to remove the local branch altogether. But I cannot rollback more than one commit which leaves me no choice than creating a new clone and dow... | If you enable the mq extension (bundled with Mercurial), you can use `hg strip`. Be careful, though, as this will modify the history of your repository. The safe method is to clone your repository up to the revision preceding the creation of the branch you want to discard, then to pull the remaining changesets that you... |
1705921 | Useful Mercurial Hooks | 22 | 2009-11-10 06:05:48 | <p>What are some useful Mercurial hooks that you have come across? </p>
<p>A few example hooks are located in the <a href="http://hgbook.red-bean.com/read/handling-repository-events-with-hooks.html" rel="noreferrer">Mercurial book</a>:</p>
<ul>
<li><a href="http://hgbook.red-bean.com/read/handling-repository-events-w... | 9,547 | 3,453 | 2020-08-10 13:01:19 | 1,709,121 | 16 | 2009-11-10 16:12:43 | 8,992 | 2018-02-22 12:08:21 | https://stackoverflow.com/q/1705921 | https://stackoverflow.com/a/1709121 | <p>My favorite hook for formal repositories is the one that refuses multiple heads. It's great when you've got a continuous integration system that needs a post-merge tip to build automatically.</p>
<p>A few examples are here: <a href="https://www.mercurial-scm.org/wiki/TipsAndTricks#Prevent_a_push_that_would_create_... | <p>My favorite hook for formal repositories is the one that refuses multiple heads. It's great when you've got a continuous integration system that needs a post-merge tip to build automatically.</p> <p>A few examples are here: <a href="https://www.mercurial-scm.org/wiki/TipsAndTricks#Prevent_a_push_that_would_create_... | 802, 853, 61928 | hook, mercurial, mercurial-hook | <h1>Useful Mercurial Hooks</h1>
<p>What are some useful Mercurial hooks that you have come across? </p>
<p>A few example hooks are located in the <a href="http://hgbook.red-bean.com/read/handling-repository-events-with-hooks.html" rel="noreferrer">Mercurial book</a>:</p>
<ul>
<li><a href="http://hgbook.red-bean.com/r... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,206 | mercurial | # Useful Mercurial Hooks
What are some useful Mercurial hooks that you have come across?
A few example hooks are located in the [Mercurial book](http://hgbook.red-bean.com/read/handling-repository-events-with-hooks.html):
- [acl](http://hgbook.red-bean.com/read/handling-repository-events-with-hooks.html#id404286)
- ... | My favorite hook for formal repositories is the one that refuses multiple heads. It's great when you've got a continuous integration system that needs a post-merge tip to build automatically.
A few examples are here: [MercurialWiki: TipsAndTricks - prevent a push that would create multiple heads](https://www.mercurial... |
3841375 | Using Mercurial via a USB flash drive | 16 | 2010-10-01 16:58:12 | <p><strong>In short:</strong> <br>
How can I use Hg to synchronize repositories between two computers using a flash drive as intermediary?</p>
<p><strong>With more detail:</strong> <br>
I often develop code on computers that aren't networked in any way, and I transfer files between these machines using a USB flash dr... | 3,206 | 102,302 | 2017-06-16 15:14:55 | 3,841,489 | 16 | 2010-10-01 17:10:34 | 137,688 | 2010-10-01 17:19:36 | https://stackoverflow.com/q/3841375 | https://stackoverflow.com/a/3841489 | <p>What you have described above in terms of using the flash drive as an intermediate storage location should work. My process would be:</p>
<p><strong>initial setup</strong></p>
<ol>
<li>create repo on computer A (using hg init)</li>
<li><p>clone the repo from computer A to flash drive</p>
<p><code>hg clone C:/path... | <p>What you have described above in terms of using the flash drive as an intermediate storage location should work. My process would be:</p> <p><strong>initial setup</strong></p> <ol> <li>create repo on computer A (using hg init)</li> <li><p>clone the repo from computer A to flash drive</p> <p><code>hg clone C:/path... | 802, 3285 | cross-platform, mercurial | <h1>Using Mercurial via a USB flash drive</h1>
<p><strong>In short:</strong> <br>
How can I use Hg to synchronize repositories between two computers using a flash drive as intermediary?</p>
<p><strong>With more detail:</strong> <br>
I often develop code on computers that aren't networked in any way, and I transfer fi... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,208 | mercurial | # Using Mercurial via a USB flash drive
**In short:**
How can I use Hg to synchronize repositories between two computers using a flash drive as intermediary?
**With more detail:**
I often develop code on computers that aren't networked in any way, and I transfer files between these machines using a USB flash dr... | What you have described above in terms of using the flash drive as an intermediate storage location should work. My process would be:
**initial setup**
1. create repo on computer A (using hg init)
2. clone the repo from computer A to flash drive
`hg clone C:/path/to/repo/A X:/path/to/flash/drive/repo`
3. clone th... |
4587372 | hg equivalant of git revert | 14 | 2011-01-03 19:00:25 | <p>I have a commit on a public repository. I would like this commit to not be there (I've moved that work off to a branch), I obviously don't want to destroy the branch history, basically just do an inverse of that commit. In git this is just <code>git revert</code>, but I'm not using git :)</p>
| 1,923 | 37,181 | 2011-01-03 19:17:39 | 4,587,511 | 16 | 2011-01-03 19:16:00 | 479,989 | 2011-01-03 19:16:00 | https://stackoverflow.com/q/4587372 | https://stackoverflow.com/a/4587511 | <p><code>hg backout</code></p>
<blockquote>
<p>hg backout [OPTION]... [-r] REV</p>
<p>reverse effect of earlier changeset</p>
<pre><code>Commit the backed out changes as a new changeset. The new
changeset is a child of the backed out changeset.
If you backout a changeset other than the tip, a new head is
crea... | <p><code>hg backout</code></p> <blockquote> <p>hg backout [OPTION]... [-r] REV</p> <p>reverse effect of earlier changeset</p> <pre><code>Commit the backed out changes as a new changeset. The new changeset is a child of the backed out changeset. If you backout a changeset other than the tip, a new head is crea... | 119, 802, 3346 | dvcs, git, mercurial | <h1>hg equivalant of git revert</h1>
<p>I have a commit on a public repository. I would like this commit to not be there (I've moved that work off to a branch), I obviously don't want to destroy the branch history, basically just do an inverse of that commit. In git this is just <code>git revert</code>, but I'm not u... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,209 | mercurial | # hg equivalant of git revert
I have a commit on a public repository. I would like this commit to not be there (I've moved that work off to a branch), I obviously don't want to destroy the branch history, basically just do an inverse of that commit. In git this is just `git revert`, but I'm not using git :) | `hg backout`
> hg backout [OPTION]... [-r] REV
>
> reverse effect of earlier changeset
>
> ```
> Commit the backed out changes as a new changeset. The new
> changeset is a child of the backed out changeset.
>
> If you backout a changeset other than the tip, a new head is
> created. This head will be the new tip and yo... |
5877959 | Creating new repositories using mercurial-server | 13 | 2011-05-04 02:50:53 | <p>According to the "Creating repositories" at <a href="http://dev.lshift.net/paul/mercurial-server/docbook.html" rel="noreferrer">http://dev.lshift.net/paul/mercurial-server/docbook.html</a> all we need to do to create new repository - is to <code>clone</code> not existent one.</p>
<p>But in 1.1 I doesn't work. And i... | 13,758 | 251,311 | 2011-05-05 12:13:41 | 5,897,456 | 16 | 2011-05-05 12:13:41 | 236,726 | 2011-05-05 12:13:41 | https://stackoverflow.com/q/5877959 | https://stackoverflow.com/a/5897456 | <p>I find it very straightforward to create a new repo using Mercurial-server. Assuming that you have the rights and that the path <em>"/dir1/dir2/"</em> already exist on the server, simply (using command line):</p>
<pre><code>mkdir new
cd new
hg init
hg clone . ssh://hg@server/dir1/dir2/new
</code></pre>
<p>Cheers,<... | <p>I find it very straightforward to create a new repo using Mercurial-server. Assuming that you have the rights and that the path <em>"/dir1/dir2/"</em> already exist on the server, simply (using command line):</p> <pre><code>mkdir new cd new hg init hg clone . ssh://hg@server/dir1/dir2/new </code></pre> <p>Cheers,<... | 802, 61237 | mercurial, mercurial-server | <h1>Creating new repositories using mercurial-server</h1>
<p>According to the "Creating repositories" at <a href="http://dev.lshift.net/paul/mercurial-server/docbook.html" rel="noreferrer">http://dev.lshift.net/paul/mercurial-server/docbook.html</a> all we need to do to create new repository - is to <code>clone</code> ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,210 | mercurial | # Creating new repositories using mercurial-server
According to the "Creating repositories" at <http://dev.lshift.net/paul/mercurial-server/docbook.html> all we need to do to create new repository - is to `clone` not existent one.
But in 1.1 I doesn't work. And if we look at code:
```
if cmd is None:
fail("direc... | I find it very straightforward to create a new repo using Mercurial-server. Assuming that you have the rights and that the path *"/dir1/dir2/"* already exist on the server, simply (using command line):
```
mkdir new
cd new
hg init
hg clone . ssh://hg@server/dir1/dir2/new
```
Cheers,
Christophe. |
1448343 | How to set different username by repository in Mercurial? | 11 | 2009-09-19 11:11:11 | <p>I am working on projects for different clients using Mercurial as a VCS. I know how to set a default user, but is there a mean to set a <em>different</em> user for each project ? </p>
| 1,116 | 14,262 | 2015-10-19 07:34:02 | 1,448,358 | 16 | 2009-09-19 11:18:30 | 148,532 | 2009-09-19 11:18:30 | https://stackoverflow.com/q/1448343 | https://stackoverflow.com/a/1448358 | <p>Just edit the file <code>.hg/hgrc</code> inside each repository. It's the same syntax as your <code>~/.hgrc</code> but will only affect a specific repo.</p>
<p>In <code>repo1/.hg/hgrc</code>:</p>
<pre><code>[ui]
username = Foo Bar <foobar@example.com>
</code></pre>
<p>And in <code>repo2/.hg/hgrc</code>:</p>... | <p>Just edit the file <code>.hg/hgrc</code> inside each repository. It's the same syntax as your <code>~/.hgrc</code> but will only affect a specific repo.</p> <p>In <code>repo1/.hg/hgrc</code>:</p> <pre><code>[ui] username = Foo Bar <foobar@example.com> </code></pre> <p>And in <code>repo2/.hg/hgrc</code>:</p>... | 802, 7330, 9084 | configuration-files, mercurial, repository | <h1>How to set different username by repository in Mercurial?</h1>
<p>I am working on projects for different clients using Mercurial as a VCS. I know how to set a default user, but is there a mean to set a <em>different</em> user for each project ? </p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,212 | mercurial | # How to set different username by repository in Mercurial?
I am working on projects for different clients using Mercurial as a VCS. I know how to set a default user, but is there a mean to set a *different* user for each project ? | Just edit the file `.hg/hgrc` inside each repository. It's the same syntax as your `~/.hgrc` but will only affect a specific repo.
In `repo1/.hg/hgrc`:
```
[ui]
username = Foo Bar <foobar@example.com>
```
And in `repo2/.hg/hgrc`:
```
[ui]
username = Something Else <something.else@example.com>
``` |
5482235 | hg diff local to remote file | 10 | 2011-03-30 05:28:01 | <p>This may be a silly question but when comparing a local to remote file, what is the path to the remote file?<br>
Does hg want you to provide the head/revision you are referring to or something?</p>
<p>ie:</p>
<pre><code>hg diff /local/file /remote?/file?
</code></pre>
| 3,915 | 509,014 | 2011-03-30 14:14:12 | 5,487,518 | 16 | 2011-03-30 14:14:12 | 8,992 | 2011-03-30 14:14:12 | https://stackoverflow.com/q/5482235 | https://stackoverflow.com/a/5487518 | <p>Mercurial doesn't do this. The only comparison with other repositories is <code>hg incoming</code> and <code>hg outgoning</code> which show which changesets differ between repositories. You can add the <code>--patch</code> option to either of those to see the patches that are the meat of those changesets, but you ... | <p>Mercurial doesn't do this. The only comparison with other repositories is <code>hg incoming</code> and <code>hg outgoning</code> which show which changesets differ between repositories. You can add the <code>--patch</code> option to either of those to see the patches that are the meat of those changesets, but you ... | 802 | mercurial | <h1>hg diff local to remote file</h1>
<p>This may be a silly question but when comparing a local to remote file, what is the path to the remote file?<br>
Does hg want you to provide the head/revision you are referring to or something?</p>
<p>ie:</p>
<pre><code>hg diff /local/file /remote?/file?
</code></pre>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,213 | mercurial | # hg diff local to remote file
This may be a silly question but when comparing a local to remote file, what is the path to the remote file?
Does hg want you to provide the head/revision you are referring to or something?
ie:
```
hg diff /local/file /remote?/file?
``` | Mercurial doesn't do this. The only comparison with other repositories is `hg incoming` and `hg outgoning` which show which changesets differ between repositories. You can add the `--patch` option to either of those to see the patches that are the meat of those changesets, but you can't compare two versions of a file w... |
1676730 | Hg Pull vs. Update to branch tip | 9 | 2009-11-04 21:27:05 | <p>Using TortoiseHg Synchronize, clicking "Pull" pulls down the <em>2nd most recent</em> revision. </p>
<p>At the bottom of the Synchronize interface is a button, "Update to branch tip." Clicking this button pulls down the most recent revision.</p>
<p>What is happening here?</p>
| 16,844 | 111,375 | 2019-01-29 13:09:13 | 1,676,806 | 16 | 2009-11-04 21:37:48 | 202,648 | 2009-11-04 21:37:48 | https://stackoverflow.com/q/1676730 | https://stackoverflow.com/a/1676806 | <p>Command line hg tells this:</p>
<blockquote>
<p>$ hg help pull</p>
</blockquote>
<p>...</p>
<pre><code>Pull changes from a remote repository to a local one.
</code></pre>
<p>...</p>
<pre><code>-R is specified). By default, this does not update the copy of the
project in the working directory.
</code></pre>
<... | <p>Command line hg tells this:</p> <blockquote> <p>$ hg help pull</p> </blockquote> <p>...</p> <pre><code>Pull changes from a remote repository to a local one. </code></pre> <p>...</p> <pre><code>-R is specified). By default, this does not update the copy of the project in the working directory. </code></pre> <... | 802, 8122 | mercurial, tortoisehg | <h1>Hg Pull vs. Update to branch tip</h1>
<p>Using TortoiseHg Synchronize, clicking "Pull" pulls down the <em>2nd most recent</em> revision. </p>
<p>At the bottom of the Synchronize interface is a button, "Update to branch tip." Clicking this button pulls down the most recent revision.</p>
<p>What is happening here... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,214 | mercurial | # Hg Pull vs. Update to branch tip
Using TortoiseHg Synchronize, clicking "Pull" pulls down the *2nd most recent* revision.
At the bottom of the Synchronize interface is a button, "Update to branch tip." Clicking this button pulls down the most recent revision.
What is happening here? | Command line hg tells this:
> $ hg help pull
...
```
Pull changes from a remote repository to a local one.
```
...
```
-R is specified). By default, this does not update the copy of the
project in the working directory.
```
vs.
> $ hg help up
...
> Update the repository's working directory to the specified
> r... |
6183374 | Undoing last addremove in Mercurial? | 8 | 2011-05-31 05:30:38 | <p>I typed </p>
<pre><code>$ hg addremove
</code></pre>
<p>but later realized that some of the files should not be part of the commit. What I should have done was to add these files to .hgignore and after that run addremove and commit.</p>
<p>Is there a way of fixing this?</p>
| 3,892 | 179,120 | 2014-02-18 14:16:03 | 6,183,495 | 16 | 2011-05-31 05:49:41 | 82,484 | 2012-10-09 18:14:15 | https://stackoverflow.com/q/6183374 | https://stackoverflow.com/a/6183495 | <p>If you have not commited yet just use <code>hg forget fileToForget</code> or use Tortoise to remove the files.</p>
<p>If you have committed and you don't mind the files to be part of history, just forget them and commit again.</p>
<p>If you don't want them to be part of your repository history, and if commiting th... | <p>If you have not commited yet just use <code>hg forget fileToForget</code> or use Tortoise to remove the files.</p> <p>If you have committed and you don't mind the files to be part of history, just forget them and commit again.</p> <p>If you don't want them to be part of your repository history, and if commiting th... | 802 | mercurial | <h1>Undoing last addremove in Mercurial?</h1>
<p>I typed </p>
<pre><code>$ hg addremove
</code></pre>
<p>but later realized that some of the files should not be part of the commit. What I should have done was to add these files to .hgignore and after that run addremove and commit.</p>
<p>Is there a way of fixing thi... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,215 | mercurial | # Undoing last addremove in Mercurial?
I typed
```
$ hg addremove
```
but later realized that some of the files should not be part of the commit. What I should have done was to add these files to .hgignore and after that run addremove and commit.
Is there a way of fixing this? | If you have not commited yet just use `hg forget fileToForget` or use Tortoise to remove the files.
If you have committed and you don't mind the files to be part of history, just forget them and commit again.
If you don't want them to be part of your repository history, and if commiting them is the very last operatio... |
7577061 | HG: Checkout 'tipmost' tag | 7 | 2011-09-28 00:24:14 | <p>In mercurial, is there an easy way to programmatically check out the 'latest' tag?</p>
<p>Meaning, if <code>hg tags</code> produces this:</p>
<pre><code>tip
Tag3
Tag2
Tag1
</code></pre>
<p>Is there an easy way to checkout Tag 3 in a generic way? Meaning, not just <code>hg checkout Tag3</code>, but a generic way o... | 1,782 | 158,876 | 2011-09-28 01:35:31 | 7,577,432 | 16 | 2011-09-28 01:35:31 | 8,992 | 2011-09-28 01:35:31 | https://stackoverflow.com/q/7577061 | https://stackoverflow.com/a/7577432 | <p>You can do it with <a href="http://selenic.com/hg/help/revsets">revsets</a>. Probably something like this:</p>
<pre><code>hg update -r 'max(tagged())'
</code></pre>
| <p>You can do it with <a href="http://selenic.com/hg/help/revsets">revsets</a>. Probably something like this:</p> <pre><code>hg update -r 'max(tagged())' </code></pre> | 115, 802 | mercurial, tags | <h1>HG: Checkout 'tipmost' tag</h1>
<p>In mercurial, is there an easy way to programmatically check out the 'latest' tag?</p>
<p>Meaning, if <code>hg tags</code> produces this:</p>
<pre><code>tip
Tag3
Tag2
Tag1
</code></pre>
<p>Is there an easy way to checkout Tag 3 in a generic way? Meaning, not just <code>hg check... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,216 | mercurial | # HG: Checkout 'tipmost' tag
In mercurial, is there an easy way to programmatically check out the 'latest' tag?
Meaning, if `hg tags` produces this:
```
tip
Tag3
Tag2
Tag1
```
Is there an easy way to checkout Tag 3 in a generic way? Meaning, not just `hg checkout Tag3`, but a generic way of doing so.
EDIT: If I mu... | You can do it with [revsets](http://selenic.com/hg/help/revsets). Probably something like this:
```
hg update -r 'max(tagged())'
``` |
1153469 | Mercurial scripting with python | 30 | 2009-07-20 13:08:01 | <p>I am trying to get the mercurial revision number/id (it's a hash not a number) programmatically in python.</p>
<p>The reason is that I want to add it to the css/js files on our website like so:</p>
<pre><code><link rel="stylesheet" href="example.css?{% mercurial_revision "example.css" %}&... | 21,298 | 2,908 | 2019-08-27 19:11:11 | 1,154,440 | 15 | 2009-07-20 16:06:03 | 132,040 | 2012-11-26 15:43:09 | https://stackoverflow.com/q/1153469 | https://stackoverflow.com/a/1154440 | <p>It's true there's no official API, but you can get an idea about best practices by reading other extensions, particularly those bundled with hg. For this particular problem, I would do something like this:</p>
<pre><code>from mercurial import ui, hg
from mercurial.node import hex
repo = hg.repository('/path/to/rep... | <p>It's true there's no official API, but you can get an idea about best practices by reading other extensions, particularly those bundled with hg. For this particular problem, I would do something like this:</p> <pre><code>from mercurial import ui, hg from mercurial.node import hex repo = hg.repository('/path/to/rep... | 16, 802, 1555 | mercurial, python, revision | <h1>Mercurial scripting with python</h1>
<p>I am trying to get the mercurial revision number/id (it's a hash not a number) programmatically in python.</p>
<p>The reason is that I want to add it to the css/js files on our website like so:</p>
<pre><code><link rel="stylesheet" href="example.css?{% mercu... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,217 | mercurial | # Mercurial scripting with python
I am trying to get the mercurial revision number/id (it's a hash not a number) programmatically in python.
The reason is that I want to add it to the css/js files on our website like so:
```
<link rel="stylesheet" href="example.css?{% mercurial_revision "example.css" %}" />
```
So ... | It's true there's no official API, but you can get an idea about best practices by reading other extensions, particularly those bundled with hg. For this particular problem, I would do something like this:
```
from mercurial import ui, hg
from mercurial.node import hex
repo = hg.repository('/path/to/repo/root', ui.ui... |
3459018 | Mercurial: how do I revert to a particular revision? | 25 | 2010-08-11 13:53:24 | <p>I'm working on a live server. I've updated to tip and it's caused problems: I need to revert back to a particular changeset (388) where things were OK.</p>
<p>I have no changes of any value on the server, the local changeset does not matter at all. In fact I <strong>actually want to kill</strong> any local accident... | 57,999 | 267,831 | 2018-02-27 14:31:03 | 3,459,271 | 15 | 2010-08-11 14:18:47 | 430,254 | 2018-02-27 14:31:03 | https://stackoverflow.com/q/3459018 | https://stackoverflow.com/a/3459271 | <pre><code>server:
- ..
- rev 386
- rev 387
- rev 388
- rev 389
clone to production
-- testing stuff, it doesn't work!
-- panic!
-- rev 390 (in panic)
-- rev 391 (in panic)
-- cool down, thinking, need to go back to 388
-- one way: hg update -C -rev 388 (to keep 390, 391)
-- other way: rm -rf dir (to discard 390, 391... | <pre><code>server: - .. - rev 386 - rev 387 - rev 388 - rev 389 clone to production -- testing stuff, it doesn't work! -- panic! -- rev 390 (in panic) -- rev 391 (in panic) -- cool down, thinking, need to go back to 388 -- one way: hg update -C -rev 388 (to keep 390, 391) -- other way: rm -rf dir (to discard 390, 391... | 802 | mercurial | <h1>Mercurial: how do I revert to a particular revision?</h1>
<p>I'm working on a live server. I've updated to tip and it's caused problems: I need to revert back to a particular changeset (388) where things were OK.</p>
<p>I have no changes of any value on the server, the local changeset does not matter at all. In fa... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,218 | mercurial | # Mercurial: how do I revert to a particular revision?
I'm working on a live server. I've updated to tip and it's caused problems: I need to revert back to a particular changeset (388) where things were OK.
I have no changes of any value on the server, the local changeset does not matter at all. In fact I **actually ... | ```
server:
- ..
- rev 386
- rev 387
- rev 388
- rev 389
clone to production
-- testing stuff, it doesn't work!
-- panic!
-- rev 390 (in panic)
-- rev 391 (in panic)
-- cool down, thinking, need to go back to 388
-- one way: hg update -C -rev 388 (to keep 390, 391)
-- other way: rm -rf dir (to discard 390, 391)
-- hg... |
5683175 | Reducing repository size in Mercurial | 22 | 2011-04-15 23:07:48 | <p>As my team works on a given project with the source in a Mercurial repository, the repository is obviously growing in size. As such, cloning a repository over the network becomes slower and slower.</p>
<p>Are there any techniques that are used for pruning out older commits or reducing the size of the repo to make t... | 4,225 | 1,463 | 2012-06-05 15:21:02 | 5,683,212 | 15 | 2011-04-15 23:12:20 | 139,010 | 2011-04-15 23:12:20 | https://stackoverflow.com/q/5683175 | https://stackoverflow.com/a/5683212 | <p>One option is to <a href="http://hgtip.com/tips/advanced/2009-11-16-using-convert-to-decompose-your-repository/" rel="noreferrer">use the <code>convert</code> extension to decompose your repository</a> to a group of smaller repositories.</p>
<blockquote>
<p>Say you have a repository that has evolved to contain ma... | <p>One option is to <a href="http://hgtip.com/tips/advanced/2009-11-16-using-convert-to-decompose-your-repository/" rel="noreferrer">use the <code>convert</code> extension to decompose your repository</a> to a group of smaller repositories.</p> <blockquote> <p>Say you have a repository that has evolved to contain ma... | 802, 1066, 8071, 8122, 47850 | continuous-integration, filesize, maven-release-plugin, mercurial, tortoisehg | <h1>Reducing repository size in Mercurial</h1>
<p>As my team works on a given project with the source in a Mercurial repository, the repository is obviously growing in size. As such, cloning a repository over the network becomes slower and slower.</p>
<p>Are there any techniques that are used for pruning out older com... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,219 | mercurial | # Reducing repository size in Mercurial
As my team works on a given project with the source in a Mercurial repository, the repository is obviously growing in size. As such, cloning a repository over the network becomes slower and slower.
Are there any techniques that are used for pruning out older commits or reducing... | One option is to [use the `convert` extension to decompose your repository](http://hgtip.com/tips/advanced/2009-11-16-using-convert-to-decompose-your-repository/) to a group of smaller repositories.
> Say you have a repository that has evolved to contain many projects (folders). And you have decided you’d be better of... |
6543020 | Fixing a failed integrity check in Mercurial? | 18 | 2011-07-01 02:27:39 | <p>I just did <code>hg pull</code> on a repository and brought in some changesets. It said to run <code>hg update</code>, so I did. Unfortunately, when I did that, it failed with the following error message:</p>
<pre><code>abort: integrity check failed on 00manifest.i:173!
</code></pre>
<p>When I run <code>hg verify<... | 18,511 | 48,700 | 2021-03-12 15:40:17 | 6,543,049 | 15 | 2011-07-01 02:34:12 | 22,211 | 2021-03-12 15:40:17 | https://stackoverflow.com/q/6543020 | https://stackoverflow.com/a/6543049 | <p>Well, since the first damaged changeset is 170, you could clone your local repository to 169 and then pull from the source. That means only pulling 5 changesets.</p>
<pre><code>hg clone -r 169 damagedrepo fixedrepo
cd fixedreop
hg verify
</code></pre>
<p>And then:</p>
<pre><code>hg pull originalsource
</code></pre>
... | <p>Well, since the first damaged changeset is 170, you could clone your local repository to 169 and then pull from the source. That means only pulling 5 changesets.</p> <pre><code>hg clone -r 169 damagedrepo fixedrepo cd fixedreop hg verify </code></pre> <p>And then:</p> <pre><code>hg pull originalsource </code></pre> ... | 802 | mercurial | <h1>Fixing a failed integrity check in Mercurial?</h1>
<p>I just did <code>hg pull</code> on a repository and brought in some changesets. It said to run <code>hg update</code>, so I did. Unfortunately, when I did that, it failed with the following error message:</p>
<pre><code>abort: integrity check failed on 00manife... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,221 | mercurial | # Fixing a failed integrity check in Mercurial?
I just did `hg pull` on a repository and brought in some changesets. It said to run `hg update`, so I did. Unfortunately, when I did that, it failed with the following error message:
```
abort: integrity check failed on 00manifest.i:173!
```
When I run `hg verify`, it ... | Well, since the first damaged changeset is 170, you could clone your local repository to 169 and then pull from the source. That means only pulling 5 changesets.
```
hg clone -r 169 damagedrepo fixedrepo
cd fixedreop
hg verify
```
And then:
```
hg pull originalsource
```
As for manual recovery of repository corrupt... |
3987719 | How can I integrate bitbucket.org's Issues with issue tracking in TortoiseHg? | 18 | 2010-10-21 13:02:29 | <p>I can not find any documentation for this - is it possible?</p>
| 3,440 | 465,722 | 2017-06-16 15:12:42 | 5,617,933 | 15 | 2011-04-11 07:09:58 | 110,204 | 2017-06-16 15:12:42 | https://stackoverflow.com/q/3987719 | https://stackoverflow.com/a/5617933 | <p>The help for the fields you've found in the TortoiseHg config dialog (<code>thg userconfig</code>) is:</p>
<ul>
<li><p>Issue Regex field:</p>
<blockquote>
<p>Defines the regex to match when picking up issue numbers.</p>
</blockquote>
</li>
<li><p>Issue Link field:</p>
<blockquote>
<p>Defines the command to run when ... | <p>The help for the fields you've found in the TortoiseHg config dialog (<code>thg userconfig</code>) is:</p> <ul> <li><p>Issue Regex field:</p> <blockquote> <p>Defines the regex to match when picking up issue numbers.</p> </blockquote> </li> <li><p>Issue Link field:</p> <blockquote> <p>Defines the command to run when ... | 8122, 8337, 23722 | bitbucket, issue-tracking, tortoisehg | <h1>How can I integrate bitbucket.org's Issues with issue tracking in TortoiseHg?</h1>
<p>I can not find any documentation for this - is it possible?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,222 | mercurial | # How can I integrate bitbucket.org's Issues with issue tracking in TortoiseHg?
I can not find any documentation for this - is it possible? | The help for the fields you've found in the TortoiseHg config dialog (`thg userconfig`) is:
- Issue Regex field:
> Defines the regex to match when picking up issue numbers.
- Issue Link field:
> Defines the command to run when an issue number is recognized. You may include groups in issue.regex, and correspondin... |
10993731 | how to use tortoisehg's search tools? | 17 | 2012-06-12 09:20:33 | <p>I want to search for a specific phrase (ie "comma_delimited") in a specific file (ie "index.php") in a specific branch (ie "ABC-123"). The reason for this is, that text is no longer in the file, and I want to see at which commit it was taken out, without looking at every revision of this file on this branch.</p>
<p... | 16,043 | 354,030 | 2012-06-12 18:29:05 | 10,994,314 | 15 | 2012-06-12 09:59:22 | 501,710 | 2012-06-12 09:59:22 | https://stackoverflow.com/q/10993731 | https://stackoverflow.com/a/10994314 | <p>There are two search buttons - one to search the repository and the other is to filter the revision graph. Maybe you pressed the wrong one?</p>
<p>If you use the menu to select View / Search this selects the search view that you want.</p>
<p>It should show you a large panel below the revision graph with a number ... | <p>There are two search buttons - one to search the repository and the other is to filter the revision graph. Maybe you pressed the wrong one?</p> <p>If you use the menu to select View / Search this selects the search view that you want.</p> <p>It should show you a large panel below the revision graph with a number ... | 802, 816, 8122 | mercurial, search, tortoisehg | <h1>how to use tortoisehg's search tools?</h1>
<p>I want to search for a specific phrase (ie "comma_delimited") in a specific file (ie "index.php") in a specific branch (ie "ABC-123"). The reason for this is, that text is no longer in the file, and I want to see at which commit it was taken out, without looking at ever... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,223 | mercurial | # how to use tortoisehg's search tools?
I want to search for a specific phrase (ie "comma_delimited") in a specific file (ie "index.php") in a specific branch (ie "ABC-123"). The reason for this is, that text is no longer in the file, and I want to see at which commit it was taken out, without looking at every revisio... | There are two search buttons - one to search the repository and the other is to filter the revision graph. Maybe you pressed the wrong one?
If you use the menu to select View / Search this selects the search view that you want.
It should show you a large panel below the revision graph with a number of controls to fil... |
4181671 | Mercurial, authentication by key | 15 | 2010-11-15 05:32:50 | <p>I have such section in my <code>~/.hgrc</code> config file</p>
<pre><code>[auth]
repo.prefix = ssh://hguser@192.168.132.72/repos
repo.key = /home/zerkms/.ssh/mercurial-repo/id_rsa
</code></pre>
<p>But when I write:</p>
<pre><code>hg clone ssh://hguser@192.168.132.72/repos/rps .
</code></pre>
<p>mercurial still r... | 16,996 | 251,311 | 2016-12-17 11:56:55 | 4,181,719 | 15 | 2010-11-15 05:41:07 | 497,043 | 2010-11-15 05:41:07 | https://stackoverflow.com/q/4181671 | https://stackoverflow.com/a/4181719 | <p><a href="http://www.selenic.com/mercurial/hgrc.5.html#auth" rel="noreferrer"><code>auth</code> isn't for SSH</a>. The key needs to be loaded in another way. If it were just ~/.ssh/id_rsa it would be done automatically, as it's not you may need to do something to register it. Using ~/.ssh/id_rsa is the easiest way no... | <p><a href="http://www.selenic.com/mercurial/hgrc.5.html#auth" rel="noreferrer"><code>auth</code> isn't for SSH</a>. The key needs to be loaded in another way. If it were just ~/.ssh/id_rsa it would be done automatically, as it's not you may need to do something to register it. Using ~/.ssh/id_rsa is the easiest way no... | 386, 802 | mercurial, ssh | <h1>Mercurial, authentication by key</h1>
<p>I have such section in my <code>~/.hgrc</code> config file</p>
<pre><code>[auth]
repo.prefix = ssh://hguser@192.168.132.72/repos
repo.key = /home/zerkms/.ssh/mercurial-repo/id_rsa
</code></pre>
<p>But when I write:</p>
<pre><code>hg clone ssh://hguser@192.168.132.72/repos... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,225 | mercurial | # Mercurial, authentication by key
I have such section in my `~/.hgrc` config file
```
[auth]
repo.prefix = ssh://hguser@192.168.132.72/repos
repo.key = /home/zerkms/.ssh/mercurial-repo/id_rsa
```
But when I write:
```
hg clone ssh://hguser@192.168.132.72/repos/rps .
```
mercurial still requires password to enter.... | [`auth` isn't for SSH](http://www.selenic.com/mercurial/hgrc.5.html#auth). The key needs to be loaded in another way. If it were just ~/.ssh/id_rsa it would be done automatically, as it's not you may need to do something to register it. Using ~/.ssh/id_rsa is the easiest way normally - put the contents of `~/.ssh/id_rs... |
8712157 | Tracking hard or symbolic links with mercurial on Windows | 14 | 2012-01-03 12:15:43 | <p>In a rather large project, I would like to put the same file (or folder) in different locations. When it is changed in one location, the changes should be propagated. In Subversion, I could use externals to achieve this behavior. </p>
<p>I tried to solve this by using hard links and symbolic links, but Mercurial se... | 4,377 | 220,438 | 2018-02-22 12:21:44 | 8,712,267 | 15 | 2012-01-03 12:25:48 | 110,204 | 2018-02-22 12:21:44 | https://stackoverflow.com/q/8712157 | https://stackoverflow.com/a/8712267 | <p>Mercurial <strong>can</strong> track symbolic links, but they look strange when checked out on Windows. What happens is that Mercurial creates a file with the <em>link target</em> as the file <em>content</em>. There is unfortunately no support for creating real symbolic links on Windows systems that support them, su... | <p>Mercurial <strong>can</strong> track symbolic links, but they look strange when checked out on Windows. What happens is that Mercurial creates a file with the <em>link target</em> as the file <em>content</em>. There is unfortunately no support for creating real symbolic links on Windows systems that support them, su... | 64, 802 | mercurial, windows | <h1>Tracking hard or symbolic links with mercurial on Windows</h1>
<p>In a rather large project, I would like to put the same file (or folder) in different locations. When it is changed in one location, the changes should be propagated. In Subversion, I could use externals to achieve this behavior. </p>
<p>I tried to ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,226 | mercurial | # Tracking hard or symbolic links with mercurial on Windows
In a rather large project, I would like to put the same file (or folder) in different locations. When it is changed in one location, the changes should be propagated. In Subversion, I could use externals to achieve this behavior.
I tried to solve this by usi... | Mercurial **can** track symbolic links, but they look strange when checked out on Windows. What happens is that Mercurial creates a file with the *link target* as the file *content*. There is unfortunately no support for creating real symbolic links on Windows systems that support them, such as Windows Vista. The resul... |
6096564 | How do I ignore .hgignore in my local repository? | 14 | 2011-05-23 11:30:16 | <p>.hgignore itself is version controlled. I've added some object dirs i want to ignore but i do not want to commit these changes to .hgignore. What do i do?</p>
| 4,761 | 446,453 | 2018-02-22 12:25:39 | 6,096,589 | 15 | 2011-05-23 11:33:03 | 84,560 | 2018-02-22 12:25:39 | https://stackoverflow.com/q/6096564 | https://stackoverflow.com/a/6096589 | <p>Add the following to the repo's <code>.hg/hgrc</code>:</p>
<pre><code>[ui]
ignore = /path/to/repo/.hg/hgignore
</code></pre>
<p>and create a new file <code>.hg/hgignore</code> beside it. This new file will be untracked, but work the same as the versioned <code>.hgignore</code> file for this specific working copy. ... | <p>Add the following to the repo's <code>.hg/hgrc</code>:</p> <pre><code>[ui] ignore = /path/to/repo/.hg/hgignore </code></pre> <p>and create a new file <code>.hg/hgignore</code> beside it. This new file will be untracked, but work the same as the versioned <code>.hgignore</code> file for this specific working copy. ... | 456, 802, 31419 | hgignore, mercurial, version-control | <h1>How do I ignore .hgignore in my local repository?</h1>
<p>.hgignore itself is version controlled. I've added some object dirs i want to ignore but i do not want to commit these changes to .hgignore. What do i do?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,227 | mercurial | # How do I ignore .hgignore in my local repository?
.hgignore itself is version controlled. I've added some object dirs i want to ignore but i do not want to commit these changes to .hgignore. What do i do? | Add the following to the repo's `.hg/hgrc`:
```
[ui]
ignore = /path/to/repo/.hg/hgignore
```
and create a new file `.hg/hgignore` beside it. This new file will be untracked, but work the same as the versioned `.hgignore` file for this specific working copy. (The `/path/to/repo` bit is unfortunate but necessary to mak... |
8798678 | Mercurial gives "invalid pattern" error for simple GLOB syntax | 12 | 2012-01-10 04:46:59 | <p>I have the following in my <code>.hgignore</code> file:</p>
<pre><code>syntax: glob
obj/*
bin/*
*.suo
*.user
*.ncb
</code></pre>
<p>If I comment out the <code>*.</code> filters, the filtering works fine filtering out the files in the <code>bin</code> and <code>obj</code> folder, however, if I keep those filters in... | 5,285 | 175,057 | 2016-07-24 18:40:22 | 8,799,898 | 15 | 2012-01-10 07:28:53 | 110,204 | 2012-01-10 21:21:49 | https://stackoverflow.com/q/8798678 | https://stackoverflow.com/a/8799898 | <p>The error message from Mercurial tells us that your <code>syntax: glob</code> line is not read by Mercurial. Patterns in ignore files default to regular expressions, and <code>*.suo</code> is indeed an invalid regular expression (a regex cannot start with <code>*</code>).</p>
<p>Since this is on Windows, and since ... | <p>The error message from Mercurial tells us that your <code>syntax: glob</code> line is not read by Mercurial. Patterns in ignore files default to regular expressions, and <code>*.suo</code> is indeed an invalid regular expression (a regex cannot start with <code>*</code>).</p> <p>Since this is on Windows, and since ... | 18, 279, 456, 802, 31419 | hgignore, mercurial, regex, unicode, version-control | <h1>Mercurial gives "invalid pattern" error for simple GLOB syntax</h1>
<p>I have the following in my <code>.hgignore</code> file:</p>
<pre><code>syntax: glob
obj/*
bin/*
*.suo
*.user
*.ncb
</code></pre>
<p>If I comment out the <code>*.</code> filters, the filtering works fine filtering out the files in the <code>bin... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,228 | mercurial | # Mercurial gives "invalid pattern" error for simple GLOB syntax
I have the following in my `.hgignore` file:
```
syntax: glob
obj/*
bin/*
*.suo
*.user
*.ncb
```
If I comment out the `*.` filters, the filtering works fine filtering out the files in the `bin` and `obj` folder, however, if I keep those filters in I re... | The error message from Mercurial tells us that your `syntax: glob` line is not read by Mercurial. Patterns in ignore files default to regular expressions, and `*.suo` is indeed an invalid regular expression (a regex cannot start with `*`).
Since this is on Windows, and since the file is UTF-8 encoded, then the only re... |
3520734 | Mercurial HG case-folding collision? | 12 | 2010-08-19 10:16:25 | <ol>
<li>first i have a file name readme</li>
<li>then i change it to README</li>
<li>commit</li>
<li>push</li>
</ol>
<p>ok the problem is there are two files: readme and README</p>
<p>how do i delete the readme on the repository ?</p>
<p>when i do update i get this error
abort: case-folding collision between readme... | 9,647 | 320,486 | 2016-05-19 02:03:37 | 3,522,650 | 15 | 2010-08-19 14:14:30 | 8,992 | 2010-08-19 14:14:30 | https://stackoverflow.com/q/3520734 | https://stackoverflow.com/a/3522650 | <p>Mercurial can handle filenames in the same directory that differ only in their case within its repositories (<code>.hg</code> directory at the top level of your repo). On case sensitive file systems (most on unix) it can handle those files in the working directory too. However, on systems that are merely case-rete... | <p>Mercurial can handle filenames in the same directory that differ only in their case within its repositories (<code>.hg</code> directory at the top level of your repo). On case sensitive file systems (most on unix) it can handle those files in the working directory too. However, on systems that are merely case-rete... | 802, 8337 | bitbucket, mercurial | <h1>Mercurial HG case-folding collision?</h1>
<ol>
<li>first i have a file name readme</li>
<li>then i change it to README</li>
<li>commit</li>
<li>push</li>
</ol>
<p>ok the problem is there are two files: readme and README</p>
<p>how do i delete the readme on the repository ?</p>
<p>when i do update i get this erro... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,229 | mercurial | # Mercurial HG case-folding collision?
1. first i have a file name readme
2. then i change it to README
3. commit
4. push
ok the problem is there are two files: readme and README
how do i delete the readme on the repository ?
when i do update i get this error
abort: case-folding collision between readme and README | Mercurial can handle filenames in the same directory that differ only in their case within its repositories (`.hg` directory at the top level of your repo). On case sensitive file systems (most on unix) it can handle those files in the working directory too. However, on systems that are merely case-retentive the OS doe... |
52117289 | Simple Mercurial extension fails to import | 11 | 2018-08-31 14:10:15 | <p>I'm trying to follow the sample code for <a href="https://www.mercurial-scm.org/wiki/WritingExtensions" rel="noreferrer">writing Mercurial extensions</a>. This is a minimal sample, copied verbatim from the sample code:</p>
<pre><code>from mercurial import cmdutil
from mercurial.i18n import _
cmdtable = {}
command ... | 3,179 | 905,692 | 2018-08-31 15:27:53 | 52,118,502 | 15 | 2018-08-31 15:20:12 | 354,577 | 2018-08-31 15:27:53 | https://stackoverflow.com/q/52117289 | https://stackoverflow.com/a/52118502 | <p>It looks like the documentation needs to be updated. <code>command</code> was <a href="https://www.mercurial-scm.org/repo/hg-committed/rev/46ba2cdda476" rel="noreferrer">moved from <code>cmdutil</code> to <code>registrar</code> in January, 2016</a> though an alias was left in place at that time. This was <a href="ht... | <p>It looks like the documentation needs to be updated. <code>command</code> was <a href="https://www.mercurial-scm.org/repo/hg-committed/rev/46ba2cdda476" rel="noreferrer">moved from <code>cmdutil</code> to <code>registrar</code> in January, 2016</a> though an alias was left in place at that time. This was <a href="ht... | 16, 802, 8122, 62895 | mercurial, mercurial-extension, python, tortoisehg | <h1>Simple Mercurial extension fails to import</h1>
<p>I'm trying to follow the sample code for <a href="https://www.mercurial-scm.org/wiki/WritingExtensions" rel="noreferrer">writing Mercurial extensions</a>. This is a minimal sample, copied verbatim from the sample code:</p>
<pre><code>from mercurial import cmdutil
... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,230 | mercurial | # Simple Mercurial extension fails to import
I'm trying to follow the sample code for [writing Mercurial extensions](https://www.mercurial-scm.org/wiki/WritingExtensions). This is a minimal sample, copied verbatim from the sample code:
```
from mercurial import cmdutil
from mercurial.i18n import _
cmdtable = {}
comm... | It looks like the documentation needs to be updated. `command` was [moved from `cmdutil` to `registrar` in January, 2016](https://www.mercurial-scm.org/repo/hg-committed/rev/46ba2cdda476) though an alias was left in place at that time. This was [marked as deprecated in November, 2017](https://www.mercurial-scm.org/repo... |
20184215 | How to get Mat with a drawable input in Android using OpenCV | 11 | 2013-11-25 03:23:22 | <p>I have some image files in the drawable folder. And now, I want to convert them into opencv Mat object. I've found a function:</p>
<pre><code>Mat img = Highgui.imread(inFile);
</code></pre>
<p>which is reading a file path to get the Mat.</p>
<p>However, I can't get path of my images as I can only read them by usi... | 7,184 | 2,080,233 | 2017-01-14 13:25:23 | 20,188,323 | 15 | 2013-11-25 08:57:57 | 2,386,917 | 2013-11-25 08:57:57 | https://stackoverflow.com/q/20184215 | https://stackoverflow.com/a/20188323 | <p>This should do</p>
<pre><code>Mat img = Utils.loadResource(context, refrenceimgID, Highgui.CV_LOAD_IMAGE_COLOR);
Imgproc.cvtColor(img, gryimg, Imgproc.COLOR_RGB2BGRA);
</code></pre>
| <p>This should do</p> <pre><code>Mat img = Utils.loadResource(context, refrenceimgID, Highgui.CV_LOAD_IMAGE_COLOR); Imgproc.cvtColor(img, gryimg, Imgproc.COLOR_RGB2BGRA); </code></pre> | 1386, 1720, 28727, 85993, 95507 | android, drawable, highgui, mat, opencv | <h1>How to get Mat with a drawable input in Android using OpenCV</h1>
<p>I have some image files in the drawable folder. And now, I want to convert them into opencv Mat object. I've found a function:</p>
<pre><code>Mat img = Highgui.imread(inFile);
</code></pre>
<p>which is reading a file path to get the Mat.</p>
<p... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,231 | mercurial | # How to get Mat with a drawable input in Android using OpenCV
I have some image files in the drawable folder. And now, I want to convert them into opencv Mat object. I've found a function:
```
Mat img = Highgui.imread(inFile);
```
which is reading a file path to get the Mat.
However, I can't get path of my images ... | This should do
```
Mat img = Utils.loadResource(context, refrenceimgID, Highgui.CV_LOAD_IMAGE_COLOR);
Imgproc.cvtColor(img, gryimg, Imgproc.COLOR_RGB2BGRA);
``` |
5280887 | How to disable easy_install or pip building ppc by default on Snow Leopard 10.6.6? | 11 | 2011-03-12 05:56:36 | <p>Since I have Xcode 4 installed and it seems xcode 4 can't build ppc binaries anymore, quite a lot of python packages(especially mercurial pymongo, etc.) can't build and complained that there is no "as" installed for ppc architecture. Is there any way to disable pip or easy_install from building ppc?</p>
<p>I have s... | 790 | 246,401 | 2011-03-23 17:52:25 | 5,340,733 | 15 | 2011-03-17 14:52:07 | 66,229 | 2011-03-17 14:52:07 | https://stackoverflow.com/q/5280887 | https://stackoverflow.com/a/5340733 | <p>You can try setting <code>ARCHFLAGS</code>:</p>
<pre><code>ARCHFLAGS="-arch i386 -arch x86_64" easy_install mercurial
</code></pre>
<p>If I just set <code>x86_64</code> and then do the easy install, I get:</p>
<pre><code>$ file bdiff.so
bdiff.so: Mach-O 64-bit bundle x86_64
</code></pre>
| <p>You can try setting <code>ARCHFLAGS</code>:</p> <pre><code>ARCHFLAGS="-arch i386 -arch x86_64" easy_install mercurial </code></pre> <p>If I just set <code>x86_64</code> and then do the easy install, I get:</p> <pre><code>$ file bdiff.so bdiff.so: Mach-O 64-bit bundle x86_64 </code></pre> | 802, 5624, 22297, 49865, 59704 | easy-install, mercurial, powerpc, pymongo, xcode4 | <h1>How to disable easy_install or pip building ppc by default on Snow Leopard 10.6.6?</h1>
<p>Since I have Xcode 4 installed and it seems xcode 4 can't build ppc binaries anymore, quite a lot of python packages(especially mercurial pymongo, etc.) can't build and complained that there is no "as" installed for ppc archi... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,232 | mercurial | # How to disable easy_install or pip building ppc by default on Snow Leopard 10.6.6?
Since I have Xcode 4 installed and it seems xcode 4 can't build ppc binaries anymore, quite a lot of python packages(especially mercurial pymongo, etc.) can't build and complained that there is no "as" installed for ppc architecture. ... | You can try setting `ARCHFLAGS`:
```
ARCHFLAGS="-arch i386 -arch x86_64" easy_install mercurial
```
If I just set `x86_64` and then do the easy install, I get:
```
$ file bdiff.so
bdiff.so: Mach-O 64-bit bundle x86_64
``` |
7013216 | Equivalent of git ls-files in mercurial? | 10 | 2011-08-10 15:14:33 | <p>How can I see the files which are currently in my <code>mercurial</code> repository?</p>
<p>Since the working directory has both tracked and untracked files. </p>
| 1,423 | 1,140,524 | 2016-01-27 00:37:20 | 7,013,349 | 15 | 2011-08-10 15:22:39 | 19,750 | 2011-08-10 15:22:39 | https://stackoverflow.com/q/7013216 | https://stackoverflow.com/a/7013349 | <p><code>hg manifest</code> will list files in commits, defaulting to the first parent of the working directory. <code>hg status</code> with various flags will list files that are tracked or untracked.</p>
| <p><code>hg manifest</code> will list files in commits, defaulting to the first parent of the working directory. <code>hg status</code> with various flags will list files that are tracked or untracked.</p> | 119, 802 | git, mercurial | <h1>Equivalent of git ls-files in mercurial?</h1>
<p>How can I see the files which are currently in my <code>mercurial</code> repository?</p>
<p>Since the working directory has both tracked and untracked files. </p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,233 | mercurial | # Equivalent of git ls-files in mercurial?
How can I see the files which are currently in my `mercurial` repository?
Since the working directory has both tracked and untracked files. | `hg manifest` will list files in commits, defaulting to the first parent of the working directory. `hg status` with various flags will list files that are tracked or untracked. |
3632385 | Easy-to-backup version control for windows single developer | 10 | 2010-09-03 01:09:45 | <p>I really need to get started with source control because I'm going absolutely crazy keeping track of my code and modifications as it is.</p>
<p>I'm a single developer on Windows. I use Eclipse for most of my development. Some of my projects are saved in wamp/www folder. Other non-PHP projects are in one or more Ecl... | 1,890 | 438,520 | 2010-09-14 18:48:22 | 3,706,894 | 15 | 2010-09-14 07:35:43 | 68,204 | 2010-09-14 18:48:22 | https://stackoverflow.com/q/3632385 | https://stackoverflow.com/a/3706894 | <p>One of fossil's strong advantages is that it was designed for "low ceremony". You don't have to do much configuration of anything, the database file itself can be kept locally, and it mostly just stays out of the way.</p>
<p>I've been using it on a handful of projects that are mostly single-principle-developer and ... | <p>One of fossil's strong advantages is that it was designed for "low ceremony". You don't have to do much configuration of anything, the database file itself can be kept locally, and it mostly just stays out of the way.</p> <p>I've been using it on a handful of projects that are mostly single-principle-developer and ... | 119, 456, 802, 11746 | fossil, git, mercurial, version-control | <h1>Easy-to-backup version control for windows single developer</h1>
<p>I really need to get started with source control because I'm going absolutely crazy keeping track of my code and modifications as it is.</p>
<p>I'm a single developer on Windows. I use Eclipse for most of my development. Some of my projects are sa... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,234 | mercurial | # Easy-to-backup version control for windows single developer
I really need to get started with source control because I'm going absolutely crazy keeping track of my code and modifications as it is.
I'm a single developer on Windows. I use Eclipse for most of my development. Some of my projects are saved in wamp/www ... | One of fossil's strong advantages is that it was designed for "low ceremony". You don't have to do much configuration of anything, the database file itself can be kept locally, and it mostly just stays out of the way.
I've been using it on a handful of projects that are mostly single-principle-developer and am becomin... |
13669457 | iOS: Scaling UITextView with pinching? | 9 | 2012-12-02 12:53:47 | <p>I'm interested in creating <code>UITextView</code> that is expanding dynamically while typing the text, and scaling as the user pinches the screen(Similar behaviour can be found in TinyPost).</p>
<p>When you just type (without pinching) the textView expands fine. When you just pinch (without typing) is works fine, ... | 9,065 | 171,911 | 2019-02-22 13:17:09 | 13,751,921 | 15 | 2012-12-06 20:24:44 | 545,599 | 2012-12-10 19:40:26 | https://stackoverflow.com/q/13669457 | https://stackoverflow.com/a/13751921 | <p>Try:</p>
<pre><code>- (void)scaleTextView:(UIPinchGestureRecognizer *)pinchGestRecognizer{
CGFloat scale = pinchGestRecognizer.scale;
createTextView.font = [UIFont fontWithName:createTextView.font.fontName size:createTextView.font.pointSize*scale];
[self textViewDidChange:createTextView];
}
</... | <p>Try:</p> <pre><code>- (void)scaleTextView:(UIPinchGestureRecognizer *)pinchGestRecognizer{ CGFloat scale = pinchGestRecognizer.scale; createTextView.font = [UIFont fontWithName:createTextView.font.fontName size:createTextView.font.pointSize*scale]; [self textViewDidChange:createTextView]; } </... | 154, 25482, 52938, 58338, 77205 | ios, iphone, uigesturerecognizer, uipinchgesturerecognizer, uitextview | <h1>iOS: Scaling UITextView with pinching?</h1>
<p>I'm interested in creating <code>UITextView</code> that is expanding dynamically while typing the text, and scaling as the user pinches the screen(Similar behaviour can be found in TinyPost).</p>
<p>When you just type (without pinching) the textView expands fine. When... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,235 | mercurial | # iOS: Scaling UITextView with pinching?
I'm interested in creating `UITextView` that is expanding dynamically while typing the text, and scaling as the user pinches the screen(Similar behaviour can be found in TinyPost).
When you just type (without pinching) the textView expands fine. When you just pinch (without ty... | Try:
```
- (void)scaleTextView:(UIPinchGestureRecognizer *)pinchGestRecognizer{
CGFloat scale = pinchGestRecognizer.scale;
createTextView.font = [UIFont fontWithName:createTextView.font.fontName size:createTextView.font.pointSize*scale];
[self textViewDidChange:createTextView];
}
```
It basicall... |
7813765 | Shelving and UnShelving TortoiseHG code on two separate computers? | 9 | 2011-10-18 21:09:04 | <p>Can i shelve some code I've been working on, at work, with TortoiseHG .. go home .. pull/merge/update ... and then UnShelve and continue working at home?</p>
<p>Does TortoiseHG offer this?</p>
<p>At work, I created a new shelve and added all my 'touched' files into the shelve. But when I got home I couldn't find/s... | 8,448 | 30,674 | 2018-12-14 13:13:55 | 7,813,862 | 15 | 2011-10-18 21:17:13 | 235,698 | 2018-12-14 13:13:55 | https://stackoverflow.com/q/7813765 | https://stackoverflow.com/a/7813862 | <p>The shelf is just a file on the local copy of the repository, so if you are working from another computer you won't see the shelf. </p>
<p>Note: TortoiseHg's implementation is just to create a diff in the file <code>.hg\shelve</code>, so potentially you could email the file home and place it in the <code>.hg</code... | <p>The shelf is just a file on the local copy of the repository, so if you are working from another computer you won't see the shelf. </p> <p>Note: TortoiseHg's implementation is just to create a diff in the file <code>.hg\shelve</code>, so potentially you could email the file home and place it in the <code>.hg</code... | 802, 8122, 31422 | mercurial, shelving, tortoisehg | <h1>Shelving and UnShelving TortoiseHG code on two separate computers?</h1>
<p>Can i shelve some code I've been working on, at work, with TortoiseHG .. go home .. pull/merge/update ... and then UnShelve and continue working at home?</p>
<p>Does TortoiseHG offer this?</p>
<p>At work, I created a new shelve and added a... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,236 | mercurial | # Shelving and UnShelving TortoiseHG code on two separate computers?
Can i shelve some code I've been working on, at work, with TortoiseHG .. go home .. pull/merge/update ... and then UnShelve and continue working at home?
Does TortoiseHG offer this?
At work, I created a new shelve and added all my 'touched' files i... | The shelf is just a file on the local copy of the repository, so if you are working from another computer you won't see the shelf.
Note: TortoiseHg's implementation is just to create a diff in the file `.hg\shelve`, so potentially you could email the file home and place it in the `.hg` folder (being careful not to des... |
5190913 | How well "hg mv" command performs | 9 | 2011-03-04 07:25:42 | <p>Let's say, there is <code>file.txt</code> in a repo and two people are hacking it. One of them moved <code>file.txt</code> to another folder with <code>hg mv</code> and immediately pushed this into the repo. Is there any chance that Mercurial will automatically merge changes from original <code>file.txt</code> into ... | 7,869 | 194,635 | 2011-03-04 10:16:14 | 5,192,398 | 15 | 2011-03-04 10:16:14 | 515,179 | 2011-03-04 10:16:14 | https://stackoverflow.com/q/5190913 | https://stackoverflow.com/a/5192398 | <p>Short answer: <strong>Yes, you can.</strong></p>
<p>Long example: <strong>a classical Java refactoring vs code change in same file</strong></p>
<pre><code>mkdir hgmv
cd hgmv/
mkdir -p com/example/hgmv/
cat << EOF > com/example/hgmv/Main.java
package com.example.hgmv;
class Main
{
public static void ma... | <p>Short answer: <strong>Yes, you can.</strong></p> <p>Long example: <strong>a classical Java refactoring vs code change in same file</strong></p> <pre><code>mkdir hgmv cd hgmv/ mkdir -p com/example/hgmv/ cat << EOF > com/example/hgmv/Main.java package com.example.hgmv; class Main { public static void ma... | 802 | mercurial | <h1>How well "hg mv" command performs</h1>
<p>Let's say, there is <code>file.txt</code> in a repo and two people are hacking it. One of them moved <code>file.txt</code> to another folder with <code>hg mv</code> and immediately pushed this into the repo. Is there any chance that Mercurial will automatically merge change... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,237 | mercurial | # How well "hg mv" command performs
Let's say, there is `file.txt` in a repo and two people are hacking it. One of them moved `file.txt` to another folder with `hg mv` and immediately pushed this into the repo. Is there any chance that Mercurial will automatically merge changes from original `file.txt` into the moved ... | Short answer: **Yes, you can.**
Long example: **a classical Java refactoring vs code change in same file**
```
mkdir hgmv
cd hgmv/
mkdir -p com/example/hgmv/
cat << EOF > com/example/hgmv/Main.java
package com.example.hgmv;
class Main
{
public static void main(String args[])
{
System.out.println("Hello Worl... |
4355256 | Mercurial and hgweb on IIS 7.5 - python error | 9 | 2010-12-04 19:01:03 | <p>I am trying to get Mercurial to host on IIS 7.5 (Win 7 x64) and keep running into an error I cant seem to fix.</p>
<p>I have followed Jeremy Skinners tutorial here: <a href="http://www.jeremyskinner.co.uk/mercurial-on-iis7/" rel="nofollow noreferrer">Mercurial on IIS7</a></p>
<p>Instead of hgwebdir, I use hgweb as... | 7,495 | 194,511 | 2017-06-16 15:25:10 | 4,367,589 | 15 | 2010-12-06 14:49:57 | 113,702 | 2017-06-16 14:19:21 | https://stackoverflow.com/q/4355256 | https://stackoverflow.com/a/4367589 | <p>I've been struggling with this same setup for the past week or so.</p>
<p>It looks to me like they have made some significant changes to how mercurial works in IIS recently, so the link above to Jeremy Skinners tutorial will be problematic for 1.7.2</p>
<p>This is a <a href="http://www.eworldui.net/blog/post/2010/... | <p>I've been struggling with this same setup for the past week or so.</p> <p>It looks to me like they have made some significant changes to how mercurial works in IIS recently, so the link above to Jeremy Skinners tutorial will be problematic for 1.7.2</p> <p>This is a <a href="http://www.eworldui.net/blog/post/2010/... | 16, 215, 802, 15655 | hgweb, iis, mercurial, python | <h1>Mercurial and hgweb on IIS 7.5 - python error</h1>
<p>I am trying to get Mercurial to host on IIS 7.5 (Win 7 x64) and keep running into an error I cant seem to fix.</p>
<p>I have followed Jeremy Skinners tutorial here: <a href="http://www.jeremyskinner.co.uk/mercurial-on-iis7/" rel="nofollow noreferrer">Mercurial ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,238 | mercurial | # Mercurial and hgweb on IIS 7.5 - python error
I am trying to get Mercurial to host on IIS 7.5 (Win 7 x64) and keep running into an error I cant seem to fix.
I have followed Jeremy Skinners tutorial here: [Mercurial on IIS7](http://www.jeremyskinner.co.uk/mercurial-on-iis7/)
Instead of hgwebdir, I use hgweb as I am... | I've been struggling with this same setup for the past week or so.
It looks to me like they have made some significant changes to how mercurial works in IIS recently, so the link above to Jeremy Skinners tutorial will be problematic for 1.7.2
This is a [more recent link](http://www.eworldui.net/blog/post/2010/04/08/S... |
548520 | How can I configure Mercurial to use WinMerge for merges, under cygwin? | 9 | 2009-02-14 05:01:07 | <p>When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn <a href="http://winmerge.org/" rel="noreferrer">WinMerge</a> to resolve merge conflicts. How can I do this?</p>
| 3,678 | 4 | 2009-12-24 21:35:50 | 548,525 | 15 | 2009-02-14 05:06:26 | 4 | 2009-02-14 05:06:26 | https://stackoverflow.com/q/548520 | https://stackoverflow.com/a/548525 | <p>The trick is that cygwin paths are not the same as Windows paths, so you need a little script that converts the cygwin paths to Windows paths before passing them as arguments to WinMerge.</p>
<p>Here's how to do it:</p>
<p>(1) Create a shell script in <code>/usr/bin/winmerge</code> as follows:</p>
<pre><code>#!/b... | <p>The trick is that cygwin paths are not the same as Windows paths, so you need a little script that converts the cygwin paths to Windows paths before passing them as arguments to WinMerge.</p> <p>Here's how to do it:</p> <p>(1) Create a shell script in <code>/usr/bin/winmerge</code> as follows:</p> <pre><code>#!/b... | 717, 802, 1731, 10933 | cygwin, mercurial, merge, winmerge | <h1>How can I configure Mercurial to use WinMerge for merges, under cygwin?</h1>
<p>When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn <a href="http://winmerge.org/" rel="noreferrer">WinMerge</a> to resolve merge conflicts. How can I do this?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,239 | mercurial | # How can I configure Mercurial to use WinMerge for merges, under cygwin?
When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn [WinMerge](http://winmerge.org/) to resolve merge conflicts. How can I do this? | The trick is that cygwin paths are not the same as Windows paths, so you need a little script that converts the cygwin paths to Windows paths before passing them as arguments to WinMerge.
Here's how to do it:
(1) Create a shell script in `/usr/bin/winmerge` as follows:
```
#!/bin/sh
"/cygdrive/c/Program Files/WinMer... |
27480071 | Mercurial - convert normal repo to bare repo | 8 | 2014-12-15 08:35:15 | <p>i´ve installed TortoiseHg with Mercurial. Another programmer of our department created a "normal" hg repo a few months ago. Now I have to change this repo into a "bare" one. Is this even possible?</p>
| 2,650 | 3,118,667 | 2014-12-15 08:45:47 | 27,480,203 | 15 | 2014-12-15 08:45:47 | 4,361,597 | 2014-12-15 08:45:47 | https://stackoverflow.com/q/27480071 | https://stackoverflow.com/a/27480203 | <p>To create a bare repo when cloning use the no update flag when cloning i.e.
<code>hg clone --noupdate ...</code></p>
<p>To convert to a bare repo update to the "null" branch use
<code>hg update null</code></p>
| <p>To create a bare repo when cloning use the no update flag when cloning i.e. <code>hg clone --noupdate ...</code></p> <p>To convert to a bare repo update to the "null" branch use <code>hg update null</code></p> | 802, 7330, 8122 | mercurial, repository, tortoisehg | <h1>Mercurial - convert normal repo to bare repo</h1>
<p>i´ve installed TortoiseHg with Mercurial. Another programmer of our department created a "normal" hg repo a few months ago. Now I have to change this repo into a "bare" one. Is this even possible?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,240 | mercurial | # Mercurial - convert normal repo to bare repo
i´ve installed TortoiseHg with Mercurial. Another programmer of our department created a "normal" hg repo a few months ago. Now I have to change this repo into a "bare" one. Is this even possible? | To create a bare repo when cloning use the no update flag when cloning i.e.
`hg clone --noupdate ...`
To convert to a bare repo update to the "null" branch use
`hg update null` |
6948108 | How to use mercurial merge functionality for rejected hunks in a patch queue, without the deprecated qsave? | 8 | 2011-08-04 20:27:03 | <p>I have a repository and am using mq patch queue for unfinished changes. The patch queue is also under version control. </p>
<p>Let's say I have 2 patches p1 and p2 (applied in that order). Now I make a change on p1:</p>
<pre><code>hg qnew p1
...
hg qnew p2
...
hg qref
hg com --mq -m"(Commit before reject)"
hg qpop... | 2,519 | 26,070 | 2018-02-22 12:25:03 | 6,951,137 | 15 | 2011-08-05 03:41:04 | 22,211 | 2018-02-22 12:25:03 | https://stackoverflow.com/q/6948108 | https://stackoverflow.com/a/6951137 | <p>The suggestion to use <code>hg rebase</code> is misleading, I think. The <a href="https://www.mercurial-scm.org/wiki/MqMergePatches" rel="nofollow noreferrer">MqMergePatch</a> page says it is a modification of <a href="https://www.mercurial-scm.org/wiki/MqMerge" rel="nofollow noreferrer">MqMerge</a>, which was a tec... | <p>The suggestion to use <code>hg rebase</code> is misleading, I think. The <a href="https://www.mercurial-scm.org/wiki/MqMergePatches" rel="nofollow noreferrer">MqMergePatch</a> page says it is a modification of <a href="https://www.mercurial-scm.org/wiki/MqMerge" rel="nofollow noreferrer">MqMerge</a>, which was a tec... | 802, 32068 | mercurial, mercurial-queue | <h1>How to use mercurial merge functionality for rejected hunks in a patch queue, without the deprecated qsave?</h1>
<p>I have a repository and am using mq patch queue for unfinished changes. The patch queue is also under version control. </p>
<p>Let's say I have 2 patches p1 and p2 (applied in that order). Now I make... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,241 | mercurial | # How to use mercurial merge functionality for rejected hunks in a patch queue, without the deprecated qsave?
I have a repository and am using mq patch queue for unfinished changes. The patch queue is also under version control.
Let's say I have 2 patches p1 and p2 (applied in that order). Now I make a change on p1:
... | The suggestion to use `hg rebase` is misleading, I think. The [MqMergePatch](https://www.mercurial-scm.org/wiki/MqMergePatches) page says it is a modification of [MqMerge](https://www.mercurial-scm.org/wiki/MqMerge), which was a technique for rebasing a series of patches on top of new changesets pulled from elsewhere.
... |
3594264 | How to config mercurial to push without asking my password through ssh? | 7 | 2010-08-29 09:48:12 | <p>I use mercurial in my project, and every time I push new changesets to the server by ssh, it ask me for a password.<br>
Then how to config the mercurial to push with out asking password? </p>
<p>I works on Ubuntu 9.10</p>
| 6,984 | 401,559 | 2015-05-30 23:23:32 | 3,594,293 | 15 | 2010-08-29 09:59:32 | 172,642 | 2010-08-29 09:59:32 | https://stackoverflow.com/q/3594264 | https://stackoverflow.com/a/3594293 | <p>On Linux and Mac, use <code>ssh-agent</code>.</p>
<ol>
<li>Ensure you have an ssh keypair (see <code>man ssh-keygen</code> for details)</li>
<li>Copy your public key (from <code>~/.ssh/id_dsa.pub</code>) to the remote machine, giving it a unique name (such as <code>myhost_key.pub</code>)</li>
<li>Log in to the remo... | <p>On Linux and Mac, use <code>ssh-agent</code>.</p> <ol> <li>Ensure you have an ssh keypair (see <code>man ssh-keygen</code> for details)</li> <li>Copy your public key (from <code>~/.ssh/id_dsa.pub</code>) to the remote machine, giving it a unique name (such as <code>myhost_key.pub</code>)</li> <li>Log in to the remo... | 220, 386, 802, 34046 | hgrc, mercurial, passwords, ssh | <h1>How to config mercurial to push without asking my password through ssh?</h1>
<p>I use mercurial in my project, and every time I push new changesets to the server by ssh, it ask me for a password.<br>
Then how to config the mercurial to push with out asking password? </p>
<p>I works on Ubuntu 9.10</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,242 | mercurial | # How to config mercurial to push without asking my password through ssh?
I use mercurial in my project, and every time I push new changesets to the server by ssh, it ask me for a password.
Then how to config the mercurial to push with out asking password?
I works on Ubuntu 9.10 | On Linux and Mac, use `ssh-agent`.
1. Ensure you have an ssh keypair (see `man ssh-keygen` for details)
2. Copy your public key (from `~/.ssh/id_dsa.pub`) to the remote machine, giving it a unique name (such as `myhost_key.pub`)
3. Log in to the remote machine normally and append the public key you just copied to the ... |
1901029 | Issues with using free Mercurial hosting like Bitbucket | 7 | 2009-12-14 13:47:26 | <p>I'm using Mercurial as my SCM, mainly because I like the ability to commit changes to a project even while offline. I'm going to be moving PCs soon and so I decided to look into finding some free Mercurial repo hosting so I don't lose my data. I signed up for a Bitbucket account and I noticed that they offer space f... | 4,241 | 215,929 | 2011-08-22 10:07:57 | 1,901,102 | 15 | 2009-12-14 14:01:42 | 13,498 | 2011-08-22 10:07:57 | https://stackoverflow.com/q/1901029 | https://stackoverflow.com/a/1901102 | <p><strike>Yes, BitBucket only offers one private repository for free.</strike></p>
<p><strong>Edit:</strong> See the comments below, BitBucket now offers as many private repos as you want, the restriction on the free plans is a maximum of 5 users accessing these private repos.</p>
<hr />
<p>However, if you're just ... | <p><strike>Yes, BitBucket only offers one private repository for free.</strike></p> <p><strong>Edit:</strong> See the comments below, BitBucket now offers as many private repos as you want, the restriction on the free plans is a maximum of 5 users accessing these private repos.</p> <hr /> <p>However, if you're just ... | 802, 8337 | bitbucket, mercurial | <h1>Issues with using free Mercurial hosting like Bitbucket</h1>
<p>I'm using Mercurial as my SCM, mainly because I like the ability to commit changes to a project even while offline. I'm going to be moving PCs soon and so I decided to look into finding some free Mercurial repo hosting so I don't lose my data. I signed... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,243 | mercurial | # Issues with using free Mercurial hosting like Bitbucket
I'm using Mercurial as my SCM, mainly because I like the ability to commit changes to a project even while offline. I'm going to be moving PCs soon and so I decided to look into finding some free Mercurial repo hosting so I don't lose my data. I signed up for a... | Yes, BitBucket only offers one private repository for free.
**Edit:** See the comments below, BitBucket now offers as many private repos as you want, the restriction on the free plans is a maximum of 5 users accessing these private repos.
---
However, if you're just worried about transferring the projects to your ne... |
17503720 | How to make hg ignore filter case insensitive | 6 | 2013-07-06 14:07:00 | <p>I am trying to set up an hg repo for an old project on Windows. I want to ignore images, binaries, and some 3rd party source files, however these files contains different casing for the same patterns, for example, .jpg and .JPG, abc_sth and ABC_sth.</p>
<p>I learned that hgignore is case sensitive, do I have to lis... | 1,468 | 71,312 | 2013-08-07 19:05:55 | 17,540,869 | 15 | 2013-07-09 05:49:07 | 71,312 | 2013-07-09 05:49:07 | https://stackoverflow.com/q/17503720 | https://stackoverflow.com/a/17540869 | <p>Finally I get enough rep to post my own answer.</p>
<p>Use regex syntax, and prefix <code>(?i)</code>. So the pattern for the example I used here can be</p>
<pre><code>syntax: regexp
(?i)\.jpg
(?i)abc_
</code></pre>
| <p>Finally I get enough rep to post my own answer.</p> <p>Use regex syntax, and prefix <code>(?i)</code>. So the pattern for the example I used here can be</p> <pre><code>syntax: regexp (?i)\.jpg (?i)abc_ </code></pre> | 802, 8122, 9708, 11057, 31419 | case-insensitive, case-sensitive, hgignore, mercurial, tortoisehg | <h1>How to make hg ignore filter case insensitive</h1>
<p>I am trying to set up an hg repo for an old project on Windows. I want to ignore images, binaries, and some 3rd party source files, however these files contains different casing for the same patterns, for example, .jpg and .JPG, abc_sth and ABC_sth.</p>
<p>I le... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,244 | mercurial | # How to make hg ignore filter case insensitive
I am trying to set up an hg repo for an old project on Windows. I want to ignore images, binaries, and some 3rd party source files, however these files contains different casing for the same patterns, for example, .jpg and .JPG, abc_sth and ABC_sth.
I learned that hgign... | Finally I get enough rep to post my own answer.
Use regex syntax, and prefix `(?i)`. So the pattern for the example I used here can be
```
syntax: regexp
(?i)\.jpg
(?i)abc_
``` |
796495 | How to resolve merging conflicts in Mercurial (v1.0.2)? | 37 | 2009-04-28 06:42:22 | <p>I have a merging conflict, using Mercurial 1.0.2:</p>
<pre><code>merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 19
hg merge 18
</code></pre>
... | 52,932 | 3,740 | 2018-03-05 11:58:10 | 796,502 | 14 | 2009-04-28 06:44:17 | 89,847 | 2017-11-03 20:05:20 | https://stackoverflow.com/q/796495 | https://stackoverflow.com/a/796502 | <p><strong>Valid for hg < v1.1 only</strong></p>
<p>There is no need to call any <code>hg</code> commands. Unlike <code>svn</code>, Mercurial does not track conflicted files. If you call <code>hg status</code>, you'll see that the file is simply marked as modified.</p>
<p>Just fix the file by hand and commit.</p>
| <p><strong>Valid for hg < v1.1 only</strong></p> <p>There is no need to call any <code>hg</code> commands. Unlike <code>svn</code>, Mercurial does not track conflicted files. If you call <code>hg status</code>, you'll see that the file is simply marked as modified.</p> <p>Just fix the file by hand and commit.</p> | 717, 802, 3146, 3346 | conflict, dvcs, mercurial, merge | <h1>How to resolve merging conflicts in Mercurial (v1.0.2)?</h1>
<p>I have a merging conflict, using Mercurial 1.0.2:</p>
<pre><code>merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,245 | mercurial | # How to resolve merging conflicts in Mercurial (v1.0.2)?
I have a merging conflict, using Mercurial 1.0.2:
```
merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
... | **Valid for hg < v1.1 only**
There is no need to call any `hg` commands. Unlike `svn`, Mercurial does not track conflicted files. If you call `hg status`, you'll see that the file is simply marked as modified.
Just fix the file by hand and commit. |
2073543 | Use WinMerge as TortoiseHG Merge tool | 33 | 2010-01-15 17:30:34 | <p>I am trying to set up WinMerge as the Merge tool into TortoiseHG;
Here is my Mercurial.ini:</p>
<pre><code>; User specific Mercurial config file.
; See the hgrc man page for details.
[ui]
username = Bargio <>
merge = winmergeu
[extdiff]
cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe
opts.winm... | 11,122 | 243,873 | 2018-09-13 16:51:44 | 2,076,255 | 14 | 2010-01-16 05:01:57 | 8,992 | 2017-06-16 12:41:59 | https://stackoverflow.com/q/2073543 | https://stackoverflow.com/a/2076255 | <p>You can add</p>
<pre><code>winmergeu.binary=True
</code></pre>
<p>as found <a href="https://www.mercurial-scm.org/wiki/MergeToolConfiguration" rel="nofollow noreferrer">here</a> if winmerge can merge binary files. If it can't you'll want to configure another merge tool that can and use matters to send the binary ... | <p>You can add</p> <pre><code>winmergeu.binary=True </code></pre> <p>as found <a href="https://www.mercurial-scm.org/wiki/MergeToolConfiguration" rel="nofollow noreferrer">here</a> if winmerge can merge binary files. If it can't you'll want to configure another merge tool that can and use matters to send the binary ... | 717, 802, 8122, 10933 | mercurial, merge, tortoisehg, winmerge | <h1>Use WinMerge as TortoiseHG Merge tool</h1>
<p>I am trying to set up WinMerge as the Merge tool into TortoiseHG;
Here is my Mercurial.ini:</p>
<pre><code>; User specific Mercurial config file.
; See the hgrc man page for details.
[ui]
username = Bargio <>
merge = winmergeu
[extdiff]
cmd.winmerge = C:\Progr... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,246 | mercurial | # Use WinMerge as TortoiseHG Merge tool
I am trying to set up WinMerge as the Merge tool into TortoiseHG;
Here is my Mercurial.ini:
```
; User specific Mercurial config file.
; See the hgrc man page for details.
[ui]
username = Bargio <>
merge = winmergeu
[extdiff]
cmd.winmerge = C:\Program Files (x86)\WinMerge\Wi... | You can add
```
winmergeu.binary=True
```
as found [here](https://www.mercurial-scm.org/wiki/MergeToolConfiguration) if winmerge can merge binary files. If it can't you'll want to configure another merge tool that can and use matters to send the binary files to that tool. |
7686193 | How do I manage an open-source and commercial version of the same project using source control? | 18 | 2011-10-07 10:46:03 | <p>We are developing an open source project, and we are using Mercurial for source management control. The Mercurial repository for this project is public (we are using Bitbucket).</p>
<p>Now we have a client for whom we need to customize our open source software. These customizations must be kept private, so we proba... | 1,592 | 983,775 | 2013-01-10 16:01:16 | 7,698,308 | 14 | 2011-10-08 16:47:39 | 110,204 | 2011-10-08 16:47:39 | https://stackoverflow.com/q/7686193 | https://stackoverflow.com/a/7698308 | <p>What you describe is a standard thing with a distributed version control system: developing in two repositories and keeping one a subset of the other. Start by making a clone for the private development:</p>
<pre><code>hg clone open private
</code></pre>
<p>Then go into <code>private</code> and make the new featur... | <p>What you describe is a standard thing with a distributed version control system: developing in two repositories and keeping one a subset of the other. Start by making a clone for the private development:</p> <pre><code>hg clone open private </code></pre> <p>Then go into <code>private</code> and make the new featur... | 119, 456, 802, 7330, 8337 | bitbucket, git, mercurial, repository, version-control | <h1>How do I manage an open-source and commercial version of the same project using source control?</h1>
<p>We are developing an open source project, and we are using Mercurial for source management control. The Mercurial repository for this project is public (we are using Bitbucket).</p>
<p>Now we have a client for w... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,247 | mercurial | # How do I manage an open-source and commercial version of the same project using source control?
We are developing an open source project, and we are using Mercurial for source management control. The Mercurial repository for this project is public (we are using Bitbucket).
Now we have a client for whom we need to c... | What you describe is a standard thing with a distributed version control system: developing in two repositories and keeping one a subset of the other. Start by making a clone for the private development:
```
hg clone open private
```
Then go into `private` and make the new features there. Commit as normal. The `priva... |
4946930 | Does merge direction matter in Mercurial? | 16 | 2011-02-09 15:30:19 | <p>Take a simple example: I'm working on the default branch, have some changesets committed locally, and I pulled a few more from the master repository. I've been working for a few days in my isolated local repository, so there's quite a few changes to merge before I can push my results back into master.</p>
<pre><cod... | 1,161 | 104,894 | 2011-12-15 10:26:53 | 4,947,142 | 14 | 2011-02-09 15:48:45 | 8,992 | 2011-02-09 15:48:45 | https://stackoverflow.com/q/4946930 | https://stackoverflow.com/a/4947142 | <p>They're (effectively) identical. You see a difference in the <code>hg log --patch --rev X</code> output size because log shows the diff of the result and (arbitrarily) its 'left' parent (officially p1), but that's not how it's stored (Mercurial has a binary diff storage format that isn't patch/diff based) and it's ... | <p>They're (effectively) identical. You see a difference in the <code>hg log --patch --rev X</code> output size because log shows the diff of the result and (arbitrarily) its 'left' parent (officially p1), but that's not how it's stored (Mercurial has a binary diff storage format that isn't patch/diff based) and it's ... | 717, 802, 3346 | dvcs, mercurial, merge | <h1>Does merge direction matter in Mercurial?</h1>
<p>Take a simple example: I'm working on the default branch, have some changesets committed locally, and I pulled a few more from the master repository. I've been working for a few days in my isolated local repository, so there's quite a few changes to merge before I c... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,248 | mercurial | # Does merge direction matter in Mercurial?
Take a simple example: I'm working on the default branch, have some changesets committed locally, and I pulled a few more from the master repository. I've been working for a few days in my isolated local repository, so there's quite a few changes to merge before I can push m... | They're (effectively) identical. You see a difference in the `hg log --patch --rev X` output size because log shows the diff of the result and (arbitrarily) its 'left' parent (officially p1), but that's not how it's stored (Mercurial has a binary diff storage format that isn't patch/diff based) and it's now how it's co... |
13404094 | Mercurial: how to abort 'graft' state? | 15 | 2012-11-15 18:46:01 | <p>When a <code>hg graft</code> fails, it leaves behind <code>.hg/graftstate</code> which signals the graft-command that a graft is in process and can be continued. Except of deleting <code>.hg/graftstate</code>, is there a cleaner way to <em>abort</em> the grafting?</p>
| 4,445 | 241,453 | 2016-04-07 09:29:22 | 34,668,793 | 14 | 2016-01-08 02:57:15 | 1,164,267 | 2016-01-08 02:57:15 | https://stackoverflow.com/q/13404094 | https://stackoverflow.com/a/34668793 | <p>You want <code>hg update --clean .</code> The earlier answer was missing the "." to indicate where to update to.</p>
| <p>You want <code>hg update --clean .</code> The earlier answer was missing the "." to indicate where to update to.</p> | 802 | mercurial | <h1>Mercurial: how to abort 'graft' state?</h1>
<p>When a <code>hg graft</code> fails, it leaves behind <code>.hg/graftstate</code> which signals the graft-command that a graft is in process and can be continued. Except of deleting <code>.hg/graftstate</code>, is there a cleaner way to <em>abort</em> the grafting?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,249 | mercurial | # Mercurial: how to abort 'graft' state?
When a `hg graft` fails, it leaves behind `.hg/graftstate` which signals the graft-command that a graft is in process and can be continued. Except of deleting `.hg/graftstate`, is there a cleaner way to *abort* the grafting? | You want `hg update --clean .` The earlier answer was missing the "." to indicate where to update to. |
3997600 | Vendor Branching, Mercurial Style? | 15 | 2010-10-22 14:09:17 | <p><strong>The scene:</strong> A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion following their <a href="http://svnbook.red-bean.co... | 2,229 | 80,161 | 2017-10-23 14:32:27 | 3,998,791 | 14 | 2010-10-22 16:14:58 | 8,992 | 2010-10-22 16:14:58 | https://stackoverflow.com/q/3997600 | https://stackoverflow.com/a/3998791 | <p>Using named branches as you've described is a fine choice (though <a href="http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/" rel="noreferrer">not the only choice</a>), but I'd still suggest using a few separate clones at well known locations to facilitate this process. Pretending that <code>http... | <p>Using named branches as you've described is a fine choice (though <a href="http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/" rel="noreferrer">not the only choice</a>), but I'd still suggest using a few separate clones at well known locations to facilitate this process. Pretending that <code>http... | 456, 802, 1879, 14695 | branch, mercurial, vendor-branch, version-control | <h1>Vendor Branching, Mercurial Style?</h1>
<p><strong>The scene:</strong> A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion followi... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,250 | mercurial | # Vendor Branching, Mercurial Style?
**The scene:** A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion following their [“Vendor Branc... | Using named branches as you've described is a fine choice (though [not the only choice](http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/)), but I'd still suggest using a few separate clones at well known locations to facilitate this process. Pretending that `http://host/hg/` is a hgweb (formerly hgw... |
42965235 | Swift 3: How do I pinch to scale and rotate UIImageView? | 13 | 2017-03-23 00:43:46 | <p>I am really struggling to find tutorials online as well as already answered questions (I have tried them and they don't seem to work). I have a UIImageView that I have in the centre of my view. I am currently able to tap and drag this wherever I want on screen. I want to be able to pinch to scale and rotate this vie... | 7,833 | 7,563,111 | 2021-02-21 18:48:01 | 42,966,881 | 14 | 2017-03-23 03:45:47 | 2,303,865 | 2021-02-21 18:48:01 | https://stackoverflow.com/q/42965235 | https://stackoverflow.com/a/42966881 | <p>You have a some problems in your code. First you need to add the <code>UIGestureRecognizerDelegate</code> to your view controller and make it your gesture recognizer delegate. You need also to implement <code>shouldRecognizeSimultaneously</code> method and return <code>true</code>. Second when applying the scale you... | <p>You have a some problems in your code. First you need to add the <code>UIGestureRecognizerDelegate</code> to your view controller and make it your gesture recognizer delegate. You need also to implement <code>shouldRecognizeSimultaneously</code> method and return <code>true</code>. Second when applying the scale you... | 25902, 77205, 104797, 116362 | swift, swift3, uikit, uipinchgesturerecognizer | <h1>Swift 3: How do I pinch to scale and rotate UIImageView?</h1>
<p>I am really struggling to find tutorials online as well as already answered questions (I have tried them and they don't seem to work). I have a UIImageView that I have in the centre of my view. I am currently able to tap and drag this wherever I want ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,251 | mercurial | # Swift 3: How do I pinch to scale and rotate UIImageView?
I am really struggling to find tutorials online as well as already answered questions (I have tried them and they don't seem to work). I have a UIImageView that I have in the centre of my view. I am currently able to tap and drag this wherever I want on screen... | You have a some problems in your code. First you need to add the `UIGestureRecognizerDelegate` to your view controller and make it your gesture recognizer delegate. You need also to implement `shouldRecognizeSimultaneously` method and return `true`. Second when applying the scale you need to save the transform when the... |
5030166 | Tag diffing in mercurial | 13 | 2011-02-17 14:23:43 | <p>In mercurial is there a way to diff between 2 different tags? </p>
<p>I have tagged my builds and have a couple commits in between builds and want to figure out the differences between the 2 builds.</p>
| 3,713 | 446,829 | 2016-07-27 17:05:34 | 5,030,297 | 14 | 2011-02-17 14:34:37 | 23,309 | 2016-07-27 17:05:34 | https://stackoverflow.com/q/5030166 | https://stackoverflow.com/a/5030297 | <pre><code>hg diff -r tag1:tag2
</code></pre>
<p>That's all there is to it.</p>
| <pre><code>hg diff -r tag1:tag2 </code></pre> <p>That's all there is to it.</p> | 606, 802 | diff, mercurial | <h1>Tag diffing in mercurial</h1>
<p>In mercurial is there a way to diff between 2 different tags? </p>
<p>I have tagged my builds and have a couple commits in between builds and want to figure out the differences between the 2 builds.</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,252 | mercurial | # Tag diffing in mercurial
In mercurial is there a way to diff between 2 different tags?
I have tagged my builds and have a couple commits in between builds and want to figure out the differences between the 2 builds. | ```
hg diff -r tag1:tag2
```
That's all there is to it. |
837858 | Introduction to Mercurial | 13 | 2009-05-08 01:31:32 | <p>I have just begun working on a project which uses Mercurial as a version control system, and I need some basic tips on how to use this. Please use this question to give some introductory tips on this technology.</p>
<ul>
<li><a href="https://www.mercurial-scm.org" rel="nofollow noreferrer">The official Mercurial si... | 2,640 | 1,542 | 2025-11-10 11:36:57 | 837,999 | 14 | 2009-05-08 02:36:41 | 57,659 | 2017-06-19 09:20:46 | https://stackoverflow.com/q/837858 | https://stackoverflow.com/a/837999 | <p>I know you already have the Mercurial site but the resource most useful to me was the <a href="https://www.mercurial-scm.org/wiki/MercurialBook" rel="nofollow noreferrer">Mercurial book</a>. It's an excellent overview of the program and how to use it. </p>
<p>I found the best way to learn Mercurial was just to use ... | <p>I know you already have the Mercurial site but the resource most useful to me was the <a href="https://www.mercurial-scm.org/wiki/MercurialBook" rel="nofollow noreferrer">Mercurial book</a>. It's an excellent overview of the program and how to use it. </p> <p>I found the best way to learn Mercurial was just to use ... | 456, 802, 3346 | dvcs, mercurial, version-control | <h1>Introduction to Mercurial</h1>
<p>I have just begun working on a project which uses Mercurial as a version control system, and I need some basic tips on how to use this. Please use this question to give some introductory tips on this technology.</p>
<ul>
<li><a href="https://www.mercurial-scm.org" rel="nofollow no... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,253 | mercurial | # Introduction to Mercurial
I have just begun working on a project which uses Mercurial as a version control system, and I need some basic tips on how to use this. Please use this question to give some introductory tips on this technology.
- [The official Mercurial site](https://www.mercurial-scm.org)
Especially, I ... | I know you already have the Mercurial site but the resource most useful to me was the [Mercurial book](https://www.mercurial-scm.org/wiki/MercurialBook). It's an excellent overview of the program and how to use it.
I found the best way to learn Mercurial was just to use it on a project. I imported into Mercurial a pro... |
8411894 | Set up a mercurial server on ubuntu | 12 | 2011-12-07 07:40:31 | <p>I am new to mercurial. Here the question is basic, but I am very confused after googling.</p>
<p>I am programming individually, I have my mercurial installed on local machine (ubuntu 11.04), it is working well. Now I would like to keep a repository on a server, such that I can push and pull whenever good for me. I ... | 12,392 | 978,320 | 2017-05-31 15:17:46 | 8,416,213 | 14 | 2011-12-07 13:39:46 | 633,281 | 2017-05-31 15:17:46 | https://stackoverflow.com/q/8411894 | https://stackoverflow.com/a/8416213 | <p>You have various way to publish a Mercurial repository on a server. You can find detailed information on the dedicated wiki page: <a href="http://mercurial-scm.org/wiki/PublishingRepositories" rel="nofollow noreferrer">Publishing Mercurial Repositories</a></p>
<p>In your case, since you want only have SSH access, t... | <p>You have various way to publish a Mercurial repository on a server. You can find detailed information on the dedicated wiki page: <a href="http://mercurial-scm.org/wiki/PublishingRepositories" rel="nofollow noreferrer">Publishing Mercurial Repositories</a></p> <p>In your case, since you want only have SSH access, t... | 386, 549, 802 | mercurial, ssh, ubuntu | <h1>Set up a mercurial server on ubuntu</h1>
<p>I am new to mercurial. Here the question is basic, but I am very confused after googling.</p>
<p>I am programming individually, I have my mercurial installed on local machine (ubuntu 11.04), it is working well. Now I would like to keep a repository on a server, such that... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,254 | mercurial | # Set up a mercurial server on ubuntu
I am new to mercurial. Here the question is basic, but I am very confused after googling.
I am programming individually, I have my mercurial installed on local machine (ubuntu 11.04), it is working well. Now I would like to keep a repository on a server, such that I can push and ... | You have various way to publish a Mercurial repository on a server. You can find detailed information on the dedicated wiki page: [Publishing Mercurial Repositories](http://mercurial-scm.org/wiki/PublishingRepositories)
In your case, since you want only have SSH access, the following steps should be enough:
1. Copy y... |
4591928 | What to do when a patch for Mercurial import fails? | 12 | 2011-01-04 08:56:38 | <p>I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this:</p>
<pre><code>applying G:\OSS\premake-dev\premake-dev_rev493... | 8,426 | 234,175 | 2017-04-22 01:16:27 | 4,592,409 | 14 | 2011-01-04 10:02:54 | 267 | 2011-01-04 10:19:59 | https://stackoverflow.com/q/4591928 | https://stackoverflow.com/a/4592409 | <p>I must confess to not having used patches a lot, so this might not be the right workflow, but what I would try, if I was in that situation was to apply the patch to the changeset it was originally based on.</p>
<p>In other words, it sounds like you have the following case:</p>
<pre><code> +-- yo... | <p>I must confess to not having used patches a lot, so this might not be the right workflow, but what I would try, if I was in that situation was to apply the patch to the changeset it was originally based on.</p> <p>In other words, it sounds like you have the following case:</p> <pre><code> +-- yo... | 456, 802, 8122 | mercurial, tortoisehg, version-control | <h1>What to do when a patch for Mercurial import fails?</h1>
<p>I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this:</... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,255 | mercurial | # What to do when a patch for Mercurial import fails?
I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this:
```
apply... | I must confess to not having used patches a lot, so this might not be the right workflow, but what I would try, if I was in that situation was to apply the patch to the changeset it was originally based on.
In other words, it sounds like you have the following case:
```
+-- you're here
... |
13920400 | Gradle task to write hg revision to file | 11 | 2012-12-17 19:01:41 | <p>Is there a simple way to write to file the mercurial version (or similar external command) in a gradle task:</p>
<p>I'm not yet groovy/gradle conversant, but my current effort looks like this:</p>
<pre><code>task versionInfo(type:Exec){
commandLine 'hg id -i -b -t'
ext.versionfile = new File('bin/$baseName... | 10,459 | 1,331,457 | 2015-10-19 11:53:50 | 13,921,663 | 14 | 2012-12-17 20:29:13 | 190,201 | 2012-12-17 20:38:56 | https://stackoverflow.com/q/13920400 | https://stackoverflow.com/a/13921663 | <p>There are two issues with this build script:</p>
<ol>
<li>the command line needs to be split; gradle's trying to execute a binary named <code>hg id -i -b t</code> instead of <code>hg</code> with arguments <code>id</code>, <code>-i</code>, <code>-b</code> and <code>t</code></li>
<li>The standard output needs to be c... | <p>There are two issues with this build script:</p> <ol> <li>the command line needs to be split; gradle's trying to execute a binary named <code>hg id -i -b t</code> instead of <code>hg</code> with arguments <code>id</code>, <code>-i</code>, <code>-b</code> and <code>t</code></li> <li>The standard output needs to be c... | 456, 802, 849, 32307 | gradle, groovy, mercurial, version-control | <h1>Gradle task to write hg revision to file</h1>
<p>Is there a simple way to write to file the mercurial version (or similar external command) in a gradle task:</p>
<p>I'm not yet groovy/gradle conversant, but my current effort looks like this:</p>
<pre><code>task versionInfo(type:Exec){
commandLine 'hg id -i -b... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,256 | mercurial | # Gradle task to write hg revision to file
Is there a simple way to write to file the mercurial version (or similar external command) in a gradle task:
I'm not yet groovy/gradle conversant, but my current effort looks like this:
```
task versionInfo(type:Exec){
commandLine 'hg id -i -b -t'
ext.versionfile = ... | There are two issues with this build script:
1. the command line needs to be split; gradle's trying to execute a binary named `hg id -i -b t` instead of `hg` with arguments `id`, `-i`, `-b` and `t`
2. The standard output needs to be captured; you can make it a `ByteOutputStream` to be read later
Try this:
```
task v... |
10288482 | Workflow to "backport" change into different Mercurial (Hg) branch? | 11 | 2012-04-23 21:18:41 | <p>We have two heads. One is our main development head and the other is one that I forgot about until today. We found a bug and fixed it in our main development branch, and I just realized it should be fixed in the older branch as well. </p>
<p>I think it would have been better to make the change on the older branc... | 2,460 | 123,930 | 2013-12-23 13:58:49 | 10,293,468 | 14 | 2012-04-24 07:22:09 | 110,204 | 2013-12-23 13:58:49 | https://stackoverflow.com/q/10288482 | https://stackoverflow.com/a/10293468 | <p>Yes, you have two good options:</p>
<h1>Graft: new in Mercurial 2.0</h1>
<p>This version introduced the <a href="http://www.selenic.com/mercurial/hg.1.html#graft" rel="nofollow noreferrer">graft command</a> which can backport changes in an intelligent way. The "intelligence" is that it will use merges internally a... | <p>Yes, you have two good options:</p> <h1>Graft: new in Mercurial 2.0</h1> <p>This version introduced the <a href="http://www.selenic.com/mercurial/hg.1.html#graft" rel="nofollow noreferrer">graft command</a> which can backport changes in an intelligent way. The "intelligence" is that it will use merges internally a... | 456, 802, 1879, 36489 | branch, cherry-pick, mercurial, version-control | <h1>Workflow to "backport" change into different Mercurial (Hg) branch?</h1>
<p>We have two heads. One is our main development head and the other is one that I forgot about until today. We found a bug and fixed it in our main development branch, and I just realized it should be fixed in the older branch as well. </p... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,257 | mercurial | # Workflow to "backport" change into different Mercurial (Hg) branch?
We have two heads. One is our main development head and the other is one that I forgot about until today. We found a bug and fixed it in our main development branch, and I just realized it should be fixed in the older branch as well.
I think it wou... | Yes, you have two good options:
# Graft: new in Mercurial 2.0
This version introduced the [graft command](http://www.selenic.com/mercurial/hg.1.html#graft) which can backport changes in an intelligent way. The "intelligence" is that it will use merges internally and this means that you get
- **Support for renames:**... |
8085287 | How do I visually "hg rebase --continue" in TortoiseHg Workbench after a Pull->Rebase operation? | 11 | 2011-11-10 19:37:41 | <p>I'm using Mercurial and after I pull changesets from a remote repo, I do a rebase (to keep it easy to sync with SVN).</p>
<p>If there are merge conflicts during the rebase, I need to execute <code>hg rebase --continue</code> after I fix them up. This isn't a big deal, but I'd like a "visual" way to do this since I'... | 5,661 | 58,391 | 2011-11-12 07:42:25 | 8,103,230 | 14 | 2011-11-12 07:42:25 | 1,038,282 | 2011-11-12 07:42:25 | https://stackoverflow.com/q/8085287 | https://stackoverflow.com/a/8103230 | <p>In TortoiseHG you can do a whole rebase using GUI so you don't need to run <code>hg rebase</code> manually. Just right click on a revision and select <code>Modify history->Rebase...</code>.</p>
<p>If you already started rebase and want to run <code>rebase --continue</code> via GUI, just run TortoiseHG, right cli... | <p>In TortoiseHG you can do a whole rebase using GUI so you don't need to run <code>hg rebase</code> manually. Just right click on a revision and select <code>Modify history->Rebase...</code>.</p> <p>If you already started rebase and want to run <code>rebase --continue</code> via GUI, just run TortoiseHG, right cli... | 802, 8122 | mercurial, tortoisehg | <h1>How do I visually "hg rebase --continue" in TortoiseHg Workbench after a Pull->Rebase operation?</h1>
<p>I'm using Mercurial and after I pull changesets from a remote repo, I do a rebase (to keep it easy to sync with SVN).</p>
<p>If there are merge conflicts during the rebase, I need to execute <code>hg rebase --c... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,258 | mercurial | # How do I visually "hg rebase --continue" in TortoiseHg Workbench after a Pull->Rebase operation?
I'm using Mercurial and after I pull changesets from a remote repo, I do a rebase (to keep it easy to sync with SVN).
If there are merge conflicts during the rebase, I need to execute `hg rebase --continue` after I fix ... | In TortoiseHG you can do a whole rebase using GUI so you don't need to run `hg rebase` manually. Just right click on a revision and select `Modify history->Rebase...`.
If you already started rebase and want to run `rebase --continue` via GUI, just run TortoiseHG, right click on any revision and select `Modify history-... |
7815001 | Recovering history in hg when move not done properly | 10 | 2011-10-18 23:35:17 | <p>So somebody on our team moved an entire folder into a subdirectory without using hg's rename feature. The directory structure is like we need it, but the history is now gone prior to the move. It shows it as a new file when the move occurred. Numerous large merges have happened since then, and so it is not really pr... | 1,688 | 121,660 | 2017-06-20 08:00:24 | 7,821,375 | 14 | 2011-10-19 12:34:10 | 310,500 | 2017-01-31 13:17:28 | https://stackoverflow.com/q/7815001 | https://stackoverflow.com/a/7821375 | <p>You need to redo the move correctly by explicitly telling Mercurial what files were moved, then merge the broken changesets. This way you will restore the history path to the original files.</p>
<p>Steps, assuming <code><x></code> is the move revision, and <code><y></code> is the current head revision.<... | <p>You need to redo the move correctly by explicitly telling Mercurial what files were moved, then merge the broken changesets. This way you will restore the history path to the original files.</p> <p>Steps, assuming <code><x></code> is the move revision, and <code><y></code> is the current head revision.<... | 456, 802 | mercurial, version-control | <h1>Recovering history in hg when move not done properly</h1>
<p>So somebody on our team moved an entire folder into a subdirectory without using hg's rename feature. The directory structure is like we need it, but the history is now gone prior to the move. It shows it as a new file when the move occurred. Numerous lar... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,259 | mercurial | # Recovering history in hg when move not done properly
So somebody on our team moved an entire folder into a subdirectory without using hg's rename feature. The directory structure is like we need it, but the history is now gone prior to the move. It shows it as a new file when the move occurred. Numerous large merges... | You need to redo the move correctly by explicitly telling Mercurial what files were moved, then merge the broken changesets. This way you will restore the history path to the original files.
Steps, assuming `<x>` is the move revision, and `<y>` is the current head revision.
1. Update to the revision before the move: ... |
5159577 | How does one configure mercurial hg to not retain backups by default? | 10 | 2011-03-01 19:52:38 | <p>I never use those .orig files, and I hate cleaning them up manually. Is there a way to configure <code>hg revert</code> to use the <code>--no-backups</code> option by default? I can't find it in the <a href="http://mercurial.selenic.com/wiki/FAQ" rel="noreferrer">Mercurial manual</a></p>
<p>Using a shell alias is... | 1,132 | 82,156 | 2013-03-13 07:44:48 | 5,159,627 | 14 | 2011-03-01 19:57:30 | 5,382 | 2011-03-02 19:35:36 | https://stackoverflow.com/q/5159577 | https://stackoverflow.com/a/5159627 | <p>You can create an alias in your config file.</p>
<p>More details on the config file at <a href="http://www.selenic.com/mercurial/hgrc.5.html" rel="noreferrer">http://www.selenic.com/mercurial/hgrc.5.html</a></p>
<p>Read the manual myself, and it looks like its changed somewhat since the last time I read it. I was ... | <p>You can create an alias in your config file.</p> <p>More details on the config file at <a href="http://www.selenic.com/mercurial/hgrc.5.html" rel="noreferrer">http://www.selenic.com/mercurial/hgrc.5.html</a></p> <p>Read the manual myself, and it looks like its changed somewhat since the last time I read it. I was ... | 802, 34046 | hgrc, mercurial | <h1>How does one configure mercurial hg to not retain backups by default?</h1>
<p>I never use those .orig files, and I hate cleaning them up manually. Is there a way to configure <code>hg revert</code> to use the <code>--no-backups</code> option by default? I can't find it in the <a href="http://mercurial.selenic.com... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,260 | mercurial | # How does one configure mercurial hg to not retain backups by default?
I never use those .orig files, and I hate cleaning them up manually. Is there a way to configure `hg revert` to use the `--no-backups` option by default? I can't find it in the [Mercurial manual](http://mercurial.selenic.com/wiki/FAQ)
Using a she... | You can create an alias in your config file.
More details on the config file at <http://www.selenic.com/mercurial/hgrc.5.html>
Read the manual myself, and it looks like its changed somewhat since the last time I read it. I was going to suggest using defaults, but it appears that has been deprecated. The recommendatio... |
9671577 | Why does Mercurial need to talk to the server, to list outgoing (non-pushed) commits? | 9 | 2012-03-12 17:11:33 | <p>When I type <code>hg outgoing</code>, I get a response like this:</p>
<pre><code>comparing with ssh://server:1234/path/to/repo
</code></pre>
<p>and a delay while it communicates over the network.</p>
<p>Why is this network traffic necessary? Is there something fundamental about Mercurial which means it can't reme... | 204 | 385,478 | 2012-03-12 22:47:43 | 9,672,031 | 14 | 2012-03-12 17:40:30 | 501,710 | 2012-03-12 20:20:12 | https://stackoverflow.com/q/9671577 | https://stackoverflow.com/a/9672031 | <p>As Mercurial is a distributed system, there are multiple ways for your changes to get from your local repo to the remote repo. </p>
<p>For example:</p>
<ul>
<li>it is possible for someone to pull changes from you and then push those changes to the remote repo</li>
<li>you could actually just copy your local repo ... | <p>As Mercurial is a distributed system, there are multiple ways for your changes to get from your local repo to the remote repo. </p> <p>For example:</p> <ul> <li>it is possible for someone to pull changes from you and then push those changes to the remote repo</li> <li>you could actually just copy your local repo ... | 802, 3346 | dvcs, mercurial | <h1>Why does Mercurial need to talk to the server, to list outgoing (non-pushed) commits?</h1>
<p>When I type <code>hg outgoing</code>, I get a response like this:</p>
<pre><code>comparing with ssh://server:1234/path/to/repo
</code></pre>
<p>and a delay while it communicates over the network.</p>
<p>Why is this netw... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,261 | mercurial | # Why does Mercurial need to talk to the server, to list outgoing (non-pushed) commits?
When I type `hg outgoing`, I get a response like this:
```
comparing with ssh://server:1234/path/to/repo
```
and a delay while it communicates over the network.
Why is this network traffic necessary? Is there something fundament... | As Mercurial is a distributed system, there are multiple ways for your changes to get from your local repo to the remote repo.
For example:
- it is possible for someone to pull changes from you and then push those changes to the remote repo
- you could actually just copy your local repo using whatever operating syste... |
3493587 | Serving multiple repos with hg serve. How? | 9 | 2010-08-16 13:31:39 | <p>The <a href="http://mercurial.selenic.com/wiki/hgserve" rel="noreferrer">wiki</a> mentions it's possible to do this under hg serve, but there aren't any examples (such as a sample webdir-conf file). Yes I know it would be better to do this all under Apache, but this is a local machine and hg serve just makes sense f... | 5,708 | 7,853 | 2016-07-13 16:11:37 | 3,493,669 | 14 | 2010-08-16 13:40:51 | 8,992 | 2016-07-13 16:11:37 | https://stackoverflow.com/q/3493587 | https://stackoverflow.com/a/3493669 | <p>As you've hinted at you use the <code>hg serve --webdir-conf FILE</code> invocation and the webdir.conf format is the same as it is for hgweb.cgi. So those examples apply to you too:</p>
<p><a href="https://www.mercurial-scm.org/wiki/HgWebDirStepByStep#Preparing_the_config" rel="nofollow noreferrer">https://www.me... | <p>As you've hinted at you use the <code>hg serve --webdir-conf FILE</code> invocation and the webdir.conf format is the same as it is for hgweb.cgi. So those examples apply to you too:</p> <p><a href="https://www.mercurial-scm.org/wiki/HgWebDirStepByStep#Preparing_the_config" rel="nofollow noreferrer">https://www.me... | 456, 529, 802, 3574 | config, installation, mercurial, version-control | <h1>Serving multiple repos with hg serve. How?</h1>
<p>The <a href="http://mercurial.selenic.com/wiki/hgserve" rel="noreferrer">wiki</a> mentions it's possible to do this under hg serve, but there aren't any examples (such as a sample webdir-conf file). Yes I know it would be better to do this all under Apache, but thi... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,262 | mercurial | # Serving multiple repos with hg serve. How?
The [wiki](http://mercurial.selenic.com/wiki/hgserve) mentions it's possible to do this under hg serve, but there aren't any examples (such as a sample webdir-conf file). Yes I know it would be better to do this all under Apache, but this is a local machine and hg serve jus... | As you've hinted at you use the `hg serve --webdir-conf FILE` invocation and the webdir.conf format is the same as it is for hgweb.cgi. So those examples apply to you too:
<https://www.mercurial-scm.org/wiki/HgWebDirStepByStep#Preparing_the_config>
so at your most basic you can do:
```
[paths]
/repos = /webdata/hg_r... |
54136933 | How do I copy commits from one branch to another? | 8 | 2019-01-10 21:10:38 | <p>I have a branch with a few revisions in it. I want to try making some code changes that require reordering and patching those commits with histedit, but I want to keep the original branch around in case it doesn't go well. How can I do that?</p>
<h2>Example</h2>
<p>Before:</p>
<pre><code>master -> change 1 -&g... | 4,344 | 129,889 | 2019-01-11 10:29:07 | 54,144,666 | 14 | 2019-01-11 10:29:07 | 2,611,159 | 2019-01-11 10:29:07 | https://stackoverflow.com/q/54136933 | https://stackoverflow.com/a/54144666 | <p>The integrated and recommended way to copy or cherry-pick commits from one branch to another is using </p>
<p><code>hg graft -r XX YY ZZ</code>.</p>
<p>where XX YY ZZ etc. are the revisions to copy to your currently checked-out branch. By default they are committed, but you can also use the <code>--no-commit</code... | <p>The integrated and recommended way to copy or cherry-pick commits from one branch to another is using </p> <p><code>hg graft -r XX YY ZZ</code>.</p> <p>where XX YY ZZ etc. are the revisions to copy to your currently checked-out branch. By default they are committed, but you can also use the <code>--no-commit</code... | 802 | mercurial | <h1>How do I copy commits from one branch to another?</h1>
<p>I have a branch with a few revisions in it. I want to try making some code changes that require reordering and patching those commits with histedit, but I want to keep the original branch around in case it doesn't go well. How can I do that?</p>
<h2>Example... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,263 | mercurial | # How do I copy commits from one branch to another?
I have a branch with a few revisions in it. I want to try making some code changes that require reordering and patching those commits with histedit, but I want to keep the original branch around in case it doesn't go well. How can I do that?
## Example
Before:
```... | The integrated and recommended way to copy or cherry-pick commits from one branch to another is using
`hg graft -r XX YY ZZ`.
where XX YY ZZ etc. are the revisions to copy to your currently checked-out branch. By default they are committed, but you can also use the `--no-commit` flag so that you can edit changes. Or ... |
10896319 | Configure Hg to not ask for user name and password on command line | 8 | 2012-06-05 11:16:14 | <p>When I try to clone a https-authenticated Mercurial repository (e.g. from kiln), it asks me for my user name</p>
<pre><code>C:\temp\test>hg clone https://<my-login-name>.kilnhg.com/Code/Repositories/Group/test
http authorization required
realm: kiln
user:
</code></pre>
<p>We want to invoke the <code>hg cl... | 11,456 | 209,706 | 2012-06-07 17:01:56 | 10,896,703 | 14 | 2012-06-05 11:43:39 | 67,988 | 2012-06-07 17:01:56 | https://stackoverflow.com/q/10896319 | https://stackoverflow.com/a/10896703 | <p>You can configure your credentials in your user-wide <code>hgrc</code> (<code>mercurial.ini</code> in the user profile directory, on Windows):</p>
<pre><code>[auth]
foo.prefix = example.com/path
foo.username = user
foo.password = password
</code></pre>
<p>Afterwards, the requests for this server will silently use ... | <p>You can configure your credentials in your user-wide <code>hgrc</code> (<code>mercurial.ini</code> in the user profile directory, on Windows):</p> <pre><code>[auth] foo.prefix = example.com/path foo.username = user foo.password = password </code></pre> <p>Afterwards, the requests for this server will silently use ... | 802 | mercurial | <h1>Configure Hg to not ask for user name and password on command line</h1>
<p>When I try to clone a https-authenticated Mercurial repository (e.g. from kiln), it asks me for my user name</p>
<pre><code>C:\temp\test>hg clone https://<my-login-name>.kilnhg.com/Code/Repositories/Group/test
http authorization re... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,264 | mercurial | # Configure Hg to not ask for user name and password on command line
When I try to clone a https-authenticated Mercurial repository (e.g. from kiln), it asks me for my user name
```
C:\temp\test>hg clone https://<my-login-name>.kilnhg.com/Code/Repositories/Group/test
http authorization required
realm: kiln
user:
```
... | You can configure your credentials in your user-wide `hgrc` (`mercurial.ini` in the user profile directory, on Windows):
```
[auth]
foo.prefix = example.com/path
foo.username = user
foo.password = password
```
Afterwards, the requests for this server will silently use the credentials provided in the `hgrc` file.
See... |
8141838 | Mercurial: Forget files of a certain extension | 8 | 2011-11-15 19:16:33 | <p>How do I remove all files from a mercurial repository having the <code>.class</code> extension?</p>
<p>This use of patterns does not work: </p>
<pre><code>PS> hg forget -I **.class
abort: no files specified
</code></pre>
<p>However, this use of patterns lists all the files I would like to forget:</p>
<pre><c... | 799 | 1,008,041 | 2017-12-15 14:50:30 | 8,142,088 | 14 | 2011-11-15 19:36:05 | 633,281 | 2011-11-15 19:36:05 | https://stackoverflow.com/q/8141838 | https://stackoverflow.com/a/8142088 | <p>You're just missing a little something in your command :</p>
<pre><code> hg forget -I **.class .
</code></pre>
<p>Note the added <code>.</code> at the end which tells Mercurial in which directory to look.</p>
<p>It's working with <code>status</code>, because <code>status</code> look in every directory by default ... | <p>You're just missing a little something in your command :</p> <pre><code> hg forget -I **.class . </code></pre> <p>Note the added <code>.</code> at the end which tells Mercurial in which directory to look.</p> <p>It's working with <code>status</code>, because <code>status</code> look in every directory by default ... | 802, 2433 | design-patterns, mercurial | <h1>Mercurial: Forget files of a certain extension</h1>
<p>How do I remove all files from a mercurial repository having the <code>.class</code> extension?</p>
<p>This use of patterns does not work: </p>
<pre><code>PS> hg forget -I **.class
abort: no files specified
</code></pre>
<p>However, this use of patterns ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,265 | mercurial | # Mercurial: Forget files of a certain extension
How do I remove all files from a mercurial repository having the `.class` extension?
This use of patterns does not work:
```
PS> hg forget -I **.class
abort: no files specified
```
However, this use of patterns lists all the files I would like to forget:
```
PS> hg ... | You're just missing a little something in your command :
```
hg forget -I **.class .
```
Note the added `.` at the end which tells Mercurial in which directory to look.
It's working with `status`, because `status` look in every directory by default if nothing is specified. For the `forget` command you must specify ... |
6132255 | Google code downloading source | 8 | 2011-05-25 23:46:54 | <p>This might be an extremely stupid question, but for the life of me, I cannot figure out how to download this:</p>
<p><a href="http://code.google.com/p/xmppframework/source/browse/#hg%253Fstate%253Dclosed" rel="noreferrer">http://code.google.com/p/xmppframework/source/browse/#hg%253Fstate%253Dclosed</a></p>
<p>Ther... | 13,037 | 1,420,271 | 2017-06-16 12:41:04 | 6,132,279 | 14 | 2011-05-25 23:50:22 | 174,032 | 2017-06-16 12:41:04 | https://stackoverflow.com/q/6132255 | https://stackoverflow.com/a/6132279 | <p>hg is the executable for Mercurial, you're going to need to download and install <a href="https://www.mercurial-scm.org" rel="nofollow noreferrer">Mercurial</a>.</p>
<p>Once you have it installed you can use it to clone the project:</p>
<pre><code>hg clone https://xmppframework.googlecode.com/hg/ xmppframework
</c... | <p>hg is the executable for Mercurial, you're going to need to download and install <a href="https://www.mercurial-scm.org" rel="nofollow noreferrer">Mercurial</a>.</p> <p>Once you have it installed you can use it to clone the project:</p> <pre><code>hg clone https://xmppframework.googlecode.com/hg/ xmppframework </c... | 802, 3682 | google-code, mercurial | <h1>Google code downloading source</h1>
<p>This might be an extremely stupid question, but for the life of me, I cannot figure out how to download this:</p>
<p><a href="http://code.google.com/p/xmppframework/source/browse/#hg%253Fstate%253Dclosed" rel="noreferrer">http://code.google.com/p/xmppframework/source/browse/#... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,266 | mercurial | # Google code downloading source
This might be an extremely stupid question, but for the life of me, I cannot figure out how to download this:
<http://code.google.com/p/xmppframework/source/browse/#hg%253Fstate%253Dclosed>
There is nothing under the "downloads" tab. And when I try to "clone" it using my terminal it ... | hg is the executable for Mercurial, you're going to need to download and install [Mercurial](https://www.mercurial-scm.org).
Once you have it installed you can use it to clone the project:
```
hg clone https://xmppframework.googlecode.com/hg/ xmppframework
``` |
5252048 | How to include more than one file pattern in Mercurial command | 8 | 2011-03-09 20:56:43 | <p>Mercurial 1.7.5 on Windows.</p>
<p>I have a few files I have modified, and want to split them into two commits. To do so, I'm playing with the -I (or --include) option. Docs state:</p>
<pre><code>-I --include PATTERN [+] include names matching the given patterns
</code></pre>
<p>I haven't been able to figur... | 1,361 | 8,169 | 2011-03-10 00:09:46 | 5,252,062 | 14 | 2011-03-09 20:58:06 | 49,972 | 2011-03-09 21:03:20 | https://stackoverflow.com/q/5252048 | https://stackoverflow.com/a/5252062 | <p>Specify <code>-I</code> before each pattern</p>
<pre><code>hg status -I C:\folderToSolution\Project1\**.cs -I C:\folderToSolution\Project3\**.cs
</code></pre>
<p>The <code>[+]</code> in the documentation means that the option can be specified more than once.</p>
| <p>Specify <code>-I</code> before each pattern</p> <pre><code>hg status -I C:\folderToSolution\Project1\**.cs -I C:\folderToSolution\Project3\**.cs </code></pre> <p>The <code>[+]</code> in the documentation means that the option can be specified more than once.</p> | 802 | mercurial | <h1>How to include more than one file pattern in Mercurial command</h1>
<p>Mercurial 1.7.5 on Windows.</p>
<p>I have a few files I have modified, and want to split them into two commits. To do so, I'm playing with the -I (or --include) option. Docs state:</p>
<pre><code>-I --include PATTERN [+] include names ma... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,267 | mercurial | # How to include more than one file pattern in Mercurial command
Mercurial 1.7.5 on Windows.
I have a few files I have modified, and want to split them into two commits. To do so, I'm playing with the -I (or --include) option. Docs state:
```
-I --include PATTERN [+] include names matching the given patterns
```... | Specify `-I` before each pattern
```
hg status -I C:\folderToSolution\Project1\**.cs -I C:\folderToSolution\Project3\**.cs
```
The `[+]` in the documentation means that the option can be specified more than once. |
2846742 | How to set permissions so two users can work on the same hg repository? | 8 | 2010-05-17 04:54:25 | <pre><code>Ubuntu: Jaunty
Mercurial: 1.3.1
Access: ssh (users john and bob)
File permission: -rw-rw---- 1 john john 129276 May 17 13:28 dirstate
User: bob
Command: 'hg st'
Response:
**abort: Permission denied: /our/respository/.hg/dirstate**
</code></pre>
<p>Obviously mercurial can't let bob see th... | 5,086 | 75,033 | 2010-11-25 03:38:54 | 2,848,613 | 14 | 2010-05-17 11:32:01 | 8,992 | 2010-05-17 11:32:01 | https://stackoverflow.com/q/2846742 | https://stackoverflow.com/a/2848613 | <p>You need to set the "group sticky bit" on all the relevant directories. That permissions bit says that any file or directory created in those directories should have group ownership of the parent directory's group, not of the creating user's primary group.</p>
<p>You can set things right by going to the top level ... | <p>You need to set the "group sticky bit" on all the relevant directories. That permissions bit says that any file or directory created in those directories should have group ownership of the parent directory's group, not of the creating user's primary group.</p> <p>You can set things right by going to the top level ... | 802 | mercurial | <h1>How to set permissions so two users can work on the same hg repository?</h1>
<pre><code>Ubuntu: Jaunty
Mercurial: 1.3.1
Access: ssh (users john and bob)
File permission: -rw-rw---- 1 john john 129276 May 17 13:28 dirstate
User: bob
Command: 'hg st'
Response:
**abort: Permission denied: /our/resp... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,268 | mercurial | # How to set permissions so two users can work on the same hg repository?
```
Ubuntu: Jaunty
Mercurial: 1.3.1
Access: ssh (users john and bob)
File permission: -rw-rw---- 1 john john 129276 May 17 13:28 dirstate
User: bob
Command: 'hg st'
Response:
**abort: Permission denied: /our/respository/.hg/d... | You need to set the "group sticky bit" on all the relevant directories. That permissions bit says that any file or directory created in those directories should have group ownership of the parent directory's group, not of the creating user's primary group.
You can set things right by going to the top level of your who... |
11769537 | Mercurial Maven Release plugin problems | 7 | 2012-08-02 00:39:51 | <p>I love using Maven and distributed SCMs like Mercurial (BitBucket).</p>
<p>However as I bring my project to scale and my Hg repository grows, I am finding the Maven Release plugin more and more cumbersome to work with.</p>
<p>The primary problem is that when a <code>mvn release:prepare</code> is called Maven doesn... | 5,457 | 244,439 | 2012-08-08 14:09:15 | 11,866,312 | 14 | 2012-08-08 14:09:15 | 1,195,197 | 2012-08-08 14:09:15 | https://stackoverflow.com/q/11769537 | https://stackoverflow.com/a/11866312 | <p>This is what I do to avoid the silly multi push to mercurial with maven:</p>
<p>First make sure you use the correct version of the plugin handling the mercurial type of scm via:</p>
<pre><code><plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</... | <p>This is what I do to avoid the silly multi push to mercurial with maven:</p> <p>First make sure you use the correct version of the plugin handling the mercurial type of scm via:</p> <pre><code><plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</... | 802, 1912, 8337, 47850 | bitbucket, maven-2, maven-release-plugin, mercurial | <h1>Mercurial Maven Release plugin problems</h1>
<p>I love using Maven and distributed SCMs like Mercurial (BitBucket).</p>
<p>However as I bring my project to scale and my Hg repository grows, I am finding the Maven Release plugin more and more cumbersome to work with.</p>
<p>The primary problem is that when a <code... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,269 | mercurial | # Mercurial Maven Release plugin problems
I love using Maven and distributed SCMs like Mercurial (BitBucket).
However as I bring my project to scale and my Hg repository grows, I am finding the Maven Release plugin more and more cumbersome to work with.
The primary problem is that when a `mvn release:prepare` is cal... | This is what I do to avoid the silly multi push to mercurial with maven:
First make sure you use the correct version of the plugin handling the mercurial type of scm via:
```
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version>
<co... |
10920423 | What to do with pyc files when Django or python is used with Mercurial? | 7 | 2012-06-06 18:58:42 | <p>Just started to use Mercurial. Wow, nice application. I moved my database file out of the code directory, but I was wondering about the <code>.pyc</code> files. I didn't include them on the initial commit. The documentation about the <code>.hgignore</code> file includes an example to exclude <code>*.pyc</code>, so I... | 9,138 | 820,321 | 2012-06-08 09:56:47 | 10,922,062 | 14 | 2012-06-06 20:49:26 | 1,440,459 | 2012-06-06 20:49:26 | https://stackoverflow.com/q/10920423 | https://stackoverflow.com/a/10922062 | <p>As mentioned in ms4py's answer, *.pyc are compiled files that will be regenerated on the fly. You wouldn't want to include these when distributing a project.</p>
<p>However, if it happens you have modules that existed before when you roll back changes and *.pyc files are left lying around, strange bugs can appear a... | <p>As mentioned in ms4py's answer, *.pyc are compiled files that will be regenerated on the fly. You wouldn't want to include these when distributing a project.</p> <p>However, if it happens you have modules that existed before when you roll back changes and *.pyc files are left lying around, strange bugs can appear a... | 16, 243, 802, 41628 | django, mercurial, pyc, python | <h1>What to do with pyc files when Django or python is used with Mercurial?</h1>
<p>Just started to use Mercurial. Wow, nice application. I moved my database file out of the code directory, but I was wondering about the <code>.pyc</code> files. I didn't include them on the initial commit. The documentation about the <c... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,270 | mercurial | # What to do with pyc files when Django or python is used with Mercurial?
Just started to use Mercurial. Wow, nice application. I moved my database file out of the code directory, but I was wondering about the `.pyc` files. I didn't include them on the initial commit. The documentation about the `.hgignore` file inclu... | As mentioned in ms4py's answer, *.pyc are compiled files that will be regenerated on the fly. You wouldn't want to include these when distributing a project.
However, if it happens you have modules that existed before when you roll back changes and *.pyc files are left lying around, strange bugs can appear as pyc file... |
9159053 | Merging bookmarks in mercurial | 7 | 2012-02-06 10:55:27 | <p>After asking <a href="https://stackoverflow.com/questions/9153623/going-between-development-production-in-mercurial/9155138#9155138">this question</a> yesterday about branching in mercurial, I've decided to try out bookmarks for short-lived branches (features), as shown below.<br>
However now when I am trying to mer... | 5,137 | 198,128 | 2016-11-22 22:49:31 | 9,159,155 | 14 | 2012-02-06 11:02:57 | 110,204 | 2016-11-22 22:49:31 | https://stackoverflow.com/q/9159053 | https://stackoverflow.com/a/9159155 | <p>Like it says, there is nothing to merge — you should use update instead:</p>
<pre><code>$ hg update feature1
</code></pre>
<p>You can only merge divergent parts of history, and here the <code>dev-1.1</code> changeset is simply an ancestor of the <code>feature1</code> changeset. Mercurial 2.1 says</p>
<pre><code>$... | <p>Like it says, there is nothing to merge — you should use update instead:</p> <pre><code>$ hg update feature1 </code></pre> <p>You can only merge divergent parts of history, and here the <code>dev-1.1</code> changeset is simply an ancestor of the <code>feature1</code> changeset. Mercurial 2.1 says</p> <pre><code>$... | 456, 802, 53847 | branching-and-merging, mercurial, version-control | <h1>Merging bookmarks in mercurial</h1>
<p>After asking <a href="https://stackoverflow.com/questions/9153623/going-between-development-production-in-mercurial/9155138#9155138">this question</a> yesterday about branching in mercurial, I've decided to try out bookmarks for short-lived branches (features), as shown below.... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,271 | mercurial | # Merging bookmarks in mercurial
After asking [this question](https://stackoverflow.com/questions/9153623/going-between-development-production-in-mercurial/9155138#9155138) yesterday about branching in mercurial, I've decided to try out bookmarks for short-lived branches (features), as shown below.
However now when ... | Like it says, there is nothing to merge — you should use update instead:
```
$ hg update feature1
```
You can only merge divergent parts of history, and here the `dev-1.1` changeset is simply an ancestor of the `feature1` changeset. Mercurial 2.1 says
```
$ hg merge feature1
abort: nothing to merge
(use 'hg update' ... |
8024694 | hgignore: need to ignore all but one .lib file | 7 | 2011-11-06 01:48:35 | <p>For my class project my team is using hg to work together and I made the ignore file from the checked answer on from <a href="https://stackoverflow.com/questions/4095696/mercurial-hgignore-for-visual-studio-2010-projects">this question</a>, with a few additions. There's a problem though. I have a .lib file necessary... | 1,185 | 468,539 | 2011-11-07 21:32:27 | 8,024,725 | 14 | 2011-11-06 01:58:39 | 382,166 | 2011-11-06 01:58:39 | https://stackoverflow.com/q/8024694 | https://stackoverflow.com/a/8024725 | <p>Just manually do hg add on the specific file (without any wildcards) e.g.:</p>
<pre><code>hg add /path/to/file
</code></pre>
<p>This overrides the .hgignore file and adds the file to the repository.</p>
| <p>Just manually do hg add on the specific file (without any wildcards) e.g.:</p> <pre><code>hg add /path/to/file </code></pre> <p>This overrides the .hgignore file and adds the file to the repository.</p> | 802, 3889, 31419 | glob, hgignore, mercurial | <h1>hgignore: need to ignore all but one .lib file</h1>
<p>For my class project my team is using hg to work together and I made the ignore file from the checked answer on from <a href="https://stackoverflow.com/questions/4095696/mercurial-hgignore-for-visual-studio-2010-projects">this question</a>, with a few additions... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,272 | mercurial | # hgignore: need to ignore all but one .lib file
For my class project my team is using hg to work together and I made the ignore file from the checked answer on from [this question](https://stackoverflow.com/questions/4095696/mercurial-hgignore-for-visual-studio-2010-projects), with a few additions. There's a problem ... | Just manually do hg add on the specific file (without any wildcards) e.g.:
```
hg add /path/to/file
```
This overrides the .hgignore file and adds the file to the repository. |
7232052 | Mercurial repo search | 7 | 2011-08-29 15:12:10 | <p>Is there a command that searches a specified string over a Mercurial repository and displays revisions where it is found?</p>
<p>If not, are there any examples of how to implement it?</p>
| 811 | 517,316 | 2011-08-29 15:13:47 | 7,232,076 | 14 | 2011-08-29 15:13:47 | 190,201 | 2011-08-29 15:13:47 | https://stackoverflow.com/q/7232052 | https://stackoverflow.com/a/7232076 | <p><code>hg grep <string></code> will search your entire repository history for <code>string</code>.</p>
| <p><code>hg grep <string></code> will search your entire repository history for <code>string</code>.</p> | 802, 816 | mercurial, search | <h1>Mercurial repo search</h1>
<p>Is there a command that searches a specified string over a Mercurial repository and displays revisions where it is found?</p>
<p>If not, are there any examples of how to implement it?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,273 | mercurial | # Mercurial repo search
Is there a command that searches a specified string over a Mercurial repository and displays revisions where it is found?
If not, are there any examples of how to implement it? | `hg grep <string>` will search your entire repository history for `string`. |
5342632 | Mercurial - basic process to revert a merge and try again | 7 | 2011-03-17 17:10:26 | <p>We merge using this process:</p>
<pre><code>cd c:\myapp
hg pull ssh://hg/myapp-1_0_1
hg merge
</code></pre>
<p>Now sometimes we mess up the merge or sometimes we get an error (ie: "can't merge file xxx - file in use"). Usually I just delete my c:\myapp repo, re-clone from the remote master repo and start over. ... | 11,069 | 47,281 | 2018-02-22 12:26:22 | 5,345,269 | 14 | 2011-03-17 21:08:30 | 151,299 | 2018-02-22 12:26:22 | https://stackoverflow.com/q/5342632 | https://stackoverflow.com/a/5345269 | <p><code>hg update -C</code> is just perfect. Why would you want to get rid of the pulled changesets? Because the update command updates to the head of the pulled changes? If this is your problem with the pulled changes, run <code>hg update -C <revision-of-your-local-head></code> and don't care about the pulled c... | <p><code>hg update -C</code> is just perfect. Why would you want to get rid of the pulled changesets? Because the update command updates to the head of the pulled changes? If this is your problem with the pulled changes, run <code>hg update -C <revision-of-your-local-head></code> and don't care about the pulled c... | 717, 802 | mercurial, merge | <h1>Mercurial - basic process to revert a merge and try again</h1>
<p>We merge using this process:</p>
<pre><code>cd c:\myapp
hg pull ssh://hg/myapp-1_0_1
hg merge
</code></pre>
<p>Now sometimes we mess up the merge or sometimes we get an error (ie: "can't merge file xxx - file in use"). Usually I just delete my c:... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,274 | mercurial | # Mercurial - basic process to revert a merge and try again
We merge using this process:
```
cd c:\myapp
hg pull ssh://hg/myapp-1_0_1
hg merge
```
Now sometimes we mess up the merge or sometimes we get an error (ie: "can't merge file xxx - file in use"). Usually I just delete my c:\myapp repo, re-clone from the remo... | `hg update -C` is just perfect. Why would you want to get rid of the pulled changesets? Because the update command updates to the head of the pulled changes? If this is your problem with the pulled changes, run `hg update -C <revision-of-your-local-head>` and don't care about the pulled changes, probably you'll pull th... |
3129314 | Is there any way to see difference between last two versions of a file using hg commands? | 7 | 2010-06-27 23:37:17 | <p>I want something like this</p>
<p>hg vdiff filename.txt -lastRevision -secondLastRevision</p>
| 7,315 | 377,611 | 2018-08-07 15:15:56 | 3,129,446 | 14 | 2010-06-28 00:22:46 | 309,425 | 2018-08-07 15:15:56 | https://stackoverflow.com/q/3129314 | https://stackoverflow.com/a/3129446 | <p>I don't know what vdiff is, but how about:</p>
<pre><code>hg diff -r rev1 -r rev2 filename.txt
</code></pre>
<p>Edit: to get the last 2 revisions, that would be:</p>
<pre><code>hg diff -r -2 -r -1 filename.txt
</code></pre>
<p>Type <code>hg help revisions</code> for information about specifying revisions.</p>
| <p>I don't know what vdiff is, but how about:</p> <pre><code>hg diff -r rev1 -r rev2 filename.txt </code></pre> <p>Edit: to get the last 2 revisions, that would be:</p> <pre><code>hg diff -r -2 -r -1 filename.txt </code></pre> <p>Type <code>hg help revisions</code> for information about specifying revisions.</p> | 802 | mercurial | <h1>Is there any way to see difference between last two versions of a file using hg commands?</h1>
<p>I want something like this</p>
<p>hg vdiff filename.txt -lastRevision -secondLastRevision</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,275 | mercurial | # Is there any way to see difference between last two versions of a file using hg commands?
I want something like this
hg vdiff filename.txt -lastRevision -secondLastRevision | I don't know what vdiff is, but how about:
```
hg diff -r rev1 -r rev2 filename.txt
```
Edit: to get the last 2 revisions, that would be:
```
hg diff -r -2 -r -1 filename.txt
```
Type `hg help revisions` for information about specifying revisions. |
37580094 | What does this questionmark (mercurial) mean? | 6 | 2016-06-01 22:56:23 | <p>It seems like a simple question, but why does this file have a question mark in front of it after I have run the commands "Hg push" and "Hg commit". How do I get this new file to upload to the mercurial server? Why did my mercurial commit leave behind a file?</p>
<pre><code> @Xinl ➜ projectfolder hg status
... | 6,582 | 4,165,272 | 2016-06-02 09:07:39 | 37,587,356 | 14 | 2016-06-02 09:07:39 | 2,611,159 | 2016-06-02 09:07:39 | https://stackoverflow.com/q/37580094 | https://stackoverflow.com/a/37587356 | <p>Quote from <code>hg help status</code> (hg's help is quite extensive and always worth a look!):</p>
<pre><code>The codes used to show the status of files are:
M = modified
A = added
R = removed
C = clean
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
= orig... | <p>Quote from <code>hg help status</code> (hg's help is quite extensive and always worth a look!):</p> <pre><code>The codes used to show the status of files are: M = modified A = added R = removed C = clean ! = missing (deleted by non-hg command, but still tracked) ? = not tracked I = ignored = orig... | 456, 802 | mercurial, version-control | <h1>What does this questionmark (mercurial) mean?</h1>
<p>It seems like a simple question, but why does this file have a question mark in front of it after I have run the commands "Hg push" and "Hg commit". How do I get this new file to upload to the mercurial server? Why did my mercurial commit leave behind a file?</... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,276 | mercurial | # What does this questionmark (mercurial) mean?
It seems like a simple question, but why does this file have a question mark in front of it after I have run the commands "Hg push" and "Hg commit". How do I get this new file to upload to the mercurial server? Why did my mercurial commit leave behind a file?
```
@X... | Quote from `hg help status` (hg's help is quite extensive and always worth a look!):
```
The codes used to show the status of files are:
M = modified
A = added
R = removed
C = clean
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
= origin of the previous file (... |
31009414 | Mercurial: alias with arguments | 6 | 2015-06-23 17:22:53 | <p>I want to create an alias so that when I run:</p>
<pre><code>hg pushbranch <<SOME_BRANCH>>
</code></pre>
<p>it aliases to:</p>
<pre><code>hg push -b <<SOME_BRANCH>>
</code></pre>
<p>Where <code>SOME_BRANCH</code> is the name of a branch I wish to push. I can create an alias in my <code>.... | 3,734 | 808,804 | 2017-06-07 00:45:30 | 31,016,322 | 14 | 2015-06-24 01:55:03 | 960,558 | 2017-06-07 00:45:30 | https://stackoverflow.com/q/31009414 | https://stackoverflow.com/a/31016322 | <p>From the <a href="https://www.selenic.com/mercurial/hgrc.5.html#alias" rel="noreferrer">hgrc help</a></p>
<blockquote>
<p>Positional arguments in the form of $1, $2, etc in the alias
definition are expanded by Mercurial before execution.</p>
</blockquote>
<p>Thus, your alias definition, which will allow to pus... | <p>From the <a href="https://www.selenic.com/mercurial/hgrc.5.html#alias" rel="noreferrer">hgrc help</a></p> <blockquote> <p>Positional arguments in the form of $1, $2, etc in the alias definition are expanded by Mercurial before execution.</p> </blockquote> <p>Thus, your alias definition, which will allow to pus... | 802, 1448 | alias, mercurial | <h1>Mercurial: alias with arguments</h1>
<p>I want to create an alias so that when I run:</p>
<pre><code>hg pushbranch <<SOME_BRANCH>>
</code></pre>
<p>it aliases to:</p>
<pre><code>hg push -b <<SOME_BRANCH>>
</code></pre>
<p>Where <code>SOME_BRANCH</code> is the name of a branch I wish to p... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,277 | mercurial | # Mercurial: alias with arguments
I want to create an alias so that when I run:
```
hg pushbranch <<SOME_BRANCH>>
```
it aliases to:
```
hg push -b <<SOME_BRANCH>>
```
Where `SOME_BRANCH` is the name of a branch I wish to push. I can create an alias in my `.hgrc`, but don't know how I could supply an argument to t... | From the [hgrc help](https://www.selenic.com/mercurial/hgrc.5.html#alias)
> Positional arguments in the form of $1, $2, etc in the alias
> definition are expanded by Mercurial before execution.
Thus, your alias definition, which will allow to push *any* branch, will be
`pushbranch = push -b $1`
and `hg pushbranch m... |
9350005 | How do I specify a merge-base to use in a 'hg merge' | 6 | 2012-02-19 14:24:18 | <p>I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge.</p>
<p>I'd like to specify a specific commit of my own choice to use as base.</p>
<p>Is this possible, and if so, how?</p>
| 1,611 | 47,901 | 2014-04-21 13:10:28 | 9,430,810 | 14 | 2012-02-24 12:29:57 | 110,204 | 2014-04-21 13:10:28 | https://stackoverflow.com/q/9350005 | https://stackoverflow.com/a/9430810 | <p><strong>Mercurial 3.0:</strong> You can now select the ancestor to use as a merge base. You do that by setting <code>merge.preferancestor</code>. Mercurial will tell you about it when this makes sense. With the example below, you would see:</p>
<pre><code>$ hg merge
note: using eb49ad46fd72 as ancestor of 333411d2f... | <p><strong>Mercurial 3.0:</strong> You can now select the ancestor to use as a merge base. You do that by setting <code>merge.preferancestor</code>. Mercurial will tell you about it when this makes sense. With the example below, you would see:</p> <pre><code>$ hg merge note: using eb49ad46fd72 as ancestor of 333411d2f... | 456, 717, 802, 3346, 77755 | dvcs, mercurial, merge, three-way-merge, version-control | <h1>How do I specify a merge-base to use in a 'hg merge'</h1>
<p>I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge.</p>
<p>I'd like to specify a specific commit of my own choice to use as... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,278 | mercurial | # How do I specify a merge-base to use in a 'hg merge'
I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge.
I'd like to specify a specific commit of my own choice to use as base.
Is this ... | **Mercurial 3.0:** You can now select the ancestor to use as a merge base. You do that by setting `merge.preferancestor`. Mercurial will tell you about it when this makes sense. With the example below, you would see:
```
$ hg merge
note: using eb49ad46fd72 as ancestor of 333411d2f751 and 7d1f71140c74
alternative... |
6007573 | How-to multiple hg mq patch queues (in one repository vs. many subrepos) | 6 | 2011-05-15 09:28:21 | <p>I am trying to set up my workflow with MQ as described in the <a href="http://mercurial.selenic.com/wiki/MqTutorial" rel="nofollow">MqTutorial</a> and in the <a href="http://hgbook.red-bean.com/read/advanced-uses-of-mercurial-queues.html" rel="nofollow">HGbook Chapter 13</a>.
The part I struggle with is how to have ... | 2,198 | 222,236 | 2012-08-08 15:00:17 | 6,010,728 | 14 | 2011-05-15 19:38:20 | 8,992 | 2011-05-15 19:38:20 | https://stackoverflow.com/q/6007573 | https://stackoverflow.com/a/6010728 | <p>Check out the <code>hg qqueue</code> command that's part of mq. It lets you switch multiple patch queues in an automated fashion:</p>
<pre><code>hg qqueue [OPTION] [QUEUE]
manage multiple patch queues
Supports switching between different patch queues, as well as creating new
patch queues and deleting exi... | <p>Check out the <code>hg qqueue</code> command that's part of mq. It lets you switch multiple patch queues in an automated fashion:</p> <pre><code>hg qqueue [OPTION] [QUEUE] manage multiple patch queues Supports switching between different patch queues, as well as creating new patch queues and deleting exi... | 802, 8122, 32068 | mercurial, mercurial-queue, tortoisehg | <h1>How-to multiple hg mq patch queues (in one repository vs. many subrepos)</h1>
<p>I am trying to set up my workflow with MQ as described in the <a href="http://mercurial.selenic.com/wiki/MqTutorial" rel="nofollow">MqTutorial</a> and in the <a href="http://hgbook.red-bean.com/read/advanced-uses-of-mercurial-queues.ht... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,279 | mercurial | # How-to multiple hg mq patch queues (in one repository vs. many subrepos)
I am trying to set up my workflow with MQ as described in the [MqTutorial](http://mercurial.selenic.com/wiki/MqTutorial) and in the [HGbook Chapter 13](http://hgbook.red-bean.com/read/advanced-uses-of-mercurial-queues.html).
The part I struggle... | Check out the `hg qqueue` command that's part of mq. It lets you switch multiple patch queues in an automated fashion:
```
hg qqueue [OPTION] [QUEUE]
manage multiple patch queues
Supports switching between different patch queues, as well as creating new
patch queues and deleting existing ones.
Omitting ... |
3677245 | Mercurial ignore-file for Eclipse and Android development | 21 | 2010-09-09 13:57:46 | <p>I have seen samples for Mercurial ignore files for <a href="https://stackoverflow.com/questions/34784/mercurial-setup-for-visual-studio-2008-projects">Visual Studio</a>, amongst others.</p>
<p>I've just started playing around with Android development, and I also use this time to experimenting with Mercurial. <stron... | 10,224 | 310,001 | 2014-07-04 01:57:26 | 3,677,452 | 13 | 2010-09-09 14:17:47 | 8,992 | 2010-09-09 14:17:47 | https://stackoverflow.com/q/3677245 | https://stackoverflow.com/a/3677452 | <p>The eclipse files should definitely be added. The general guideline is to add:</p>
<ul>
<li>everything that is hand written/typed</li>
<li>the minimal subset of everything else necessary to build the project</li>
</ul>
<p>That last one is where your judgement comes in. It clearly excludes the .jar files you build... | <p>The eclipse files should definitely be added. The general guideline is to add:</p> <ul> <li>everything that is hand written/typed</li> <li>the minimal subset of everything else necessary to build the project</li> </ul> <p>That last one is where your judgement comes in. It clearly excludes the .jar files you build... | 53, 802, 1386, 31419 | android, eclipse, hgignore, mercurial | <h1>Mercurial ignore-file for Eclipse and Android development</h1>
<p>I have seen samples for Mercurial ignore files for <a href="https://stackoverflow.com/questions/34784/mercurial-setup-for-visual-studio-2008-projects">Visual Studio</a>, amongst others.</p>
<p>I've just started playing around with Android developmen... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,280 | mercurial | # Mercurial ignore-file for Eclipse and Android development
I have seen samples for Mercurial ignore files for [Visual Studio](https://stackoverflow.com/questions/34784/mercurial-setup-for-visual-studio-2008-projects), amongst others.
I've just started playing around with Android development, and I also use this time... | The eclipse files should definitely be added. The general guideline is to add:
- everything that is hand written/typed
- the minimal subset of everything else necessary to build the project
That last one is where your judgement comes in. It clearly excludes the .jar files you build yourself and your final .apk, but d... |
22011316 | Mercurial .hgignore for Visual Studio 2013 projects | 19 | 2014-02-25 10:26:04 | <p>As a followup to my question on <a href="https://stackoverflow.com/questions/12709422/mercurial-hgignore-for-visual-studio-2012-projects">VS2012</a>, are there any addition that should be made to the <code>.hgignore</code> file for VS2013? Below is the previous answer.</p>
<pre><code>###############################... | 3,804 | 608,694 | 2014-11-15 22:26:28 | 26,951,420 | 13 | 2014-11-15 22:22:56 | 1,810,429 | 2014-11-15 22:22:56 | https://stackoverflow.com/q/22011316 | https://stackoverflow.com/a/26951420 | <p>By merging the <code>.hgignore</code> I use regularly (with VS 2013 Ultimate) and the <code>.hgignore</code> in your question I compiled the following:</p>
<pre><code>############################################################
## Visual Studio 2013
############################################################
synta... | <p>By merging the <code>.hgignore</code> I use regularly (with VS 2013 Ultimate) and the <code>.hgignore</code> in your question I compiled the following:</p> <pre><code>############################################################ ## Visual Studio 2013 ############################################################ synta... | 456, 802, 31419, 33953, 93364 | hgignore, mercurial, version-control, visual-studio, visual-studio-2013 | <h1>Mercurial .hgignore for Visual Studio 2013 projects</h1>
<p>As a followup to my question on <a href="https://stackoverflow.com/questions/12709422/mercurial-hgignore-for-visual-studio-2012-projects">VS2012</a>, are there any addition that should be made to the <code>.hgignore</code> file for VS2013? Below is the pre... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,281 | mercurial | # Mercurial .hgignore for Visual Studio 2013 projects
As a followup to my question on [VS2012](https://stackoverflow.com/questions/12709422/mercurial-hgignore-for-visual-studio-2012-projects), are there any addition that should be made to the `.hgignore` file for VS2013? Below is the previous answer.
```
############... | By merging the `.hgignore` I use regularly (with VS 2013 Ultimate) and the `.hgignore` in your question I compiled the following:
```
############################################################
## Visual Studio 2013
############################################################
syntax: glob
## User-specific files
*.s... |
17169232 | What's the best way to close a Mercurial branch? | 19 | 2013-06-18 12:46:13 | <p>Is it better to first close a branch and then merge it with the default branch(for instance) or first merge it and then close it?</p>
<p>In TortoiseHg for instance, in the first case, you'll see a line from a close node to the default branch. In the second case you'll see a line from the last commit to the default ... | 17,084 | 26,521 | 2015-09-29 05:40:02 | 17,173,829 | 13 | 2013-06-18 16:09:04 | 218,597 | 2013-06-18 16:09:04 | https://stackoverflow.com/q/17169232 | https://stackoverflow.com/a/17173829 | <p>There is no real difference between the two methods when talking about named branches, at least in any recent version of Mercurial. Things were different pre-1.5(?), but purely in the fact that <code>hg heads</code> and <code>hg branches</code> would include these "closed" branches in their output - they still can ... | <p>There is no real difference between the two methods when talking about named branches, at least in any recent version of Mercurial. Things were different pre-1.5(?), but purely in the fact that <code>hg heads</code> and <code>hg branches</code> would include these "closed" branches in their output - they still can ... | 802, 8122 | mercurial, tortoisehg | <h1>What's the best way to close a Mercurial branch?</h1>
<p>Is it better to first close a branch and then merge it with the default branch(for instance) or first merge it and then close it?</p>
<p>In TortoiseHg for instance, in the first case, you'll see a line from a close node to the default branch. In the second c... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,282 | mercurial | # What's the best way to close a Mercurial branch?
Is it better to first close a branch and then merge it with the default branch(for instance) or first merge it and then close it?
In TortoiseHg for instance, in the first case, you'll see a line from a close node to the default branch. In the second case you'll see a... | There is no real difference between the two methods when talking about named branches, at least in any recent version of Mercurial. Things were different pre-1.5(?), but purely in the fact that `hg heads` and `hg branches` would include these "closed" branches in their output - they still can if you specify `-c` on the... |
4925094 | Rollback multiple commits (before Pushed to public) in Mercurial | 18 | 2011-02-07 18:40:51 | <p>I am aware that rollbacks can remove commits from the latest changeset in a local repository. However, is it possible to remove all the latest commits since the previous push without having to re-clone the share repository?</p>
| 4,999 | 553,877 | 2017-05-26 20:11:38 | 4,925,796 | 13 | 2011-02-07 19:51:09 | 6,309 | 2011-02-07 19:51:09 | https://stackoverflow.com/q/4925094 | https://stackoverflow.com/a/4925796 | <p>You could make a new repo with <a href="http://www.selenic.com/mercurial/hg.1.html#clone" rel="noreferrer"><code>hg clone</code></a>:</p>
<pre><code>hg clone -r last_good_changeset localrepo newlocalrepo
</code></pre>
| <p>You could make a new repo with <a href="http://www.selenic.com/mercurial/hg.1.html#clone" rel="noreferrer"><code>hg clone</code></a>:</p> <pre><code>hg clone -r last_good_changeset localrepo newlocalrepo </code></pre> | 802, 5597, 7330, 12196 | commit, mercurial, repository, rollback | <h1>Rollback multiple commits (before Pushed to public) in Mercurial</h1>
<p>I am aware that rollbacks can remove commits from the latest changeset in a local repository. However, is it possible to remove all the latest commits since the previous push without having to re-clone the share repository?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,283 | mercurial | # Rollback multiple commits (before Pushed to public) in Mercurial
I am aware that rollbacks can remove commits from the latest changeset in a local repository. However, is it possible to remove all the latest commits since the previous push without having to re-clone the share repository? | You could make a new repo with [`hg clone`](http://www.selenic.com/mercurial/hg.1.html#clone):
```
hg clone -r last_good_changeset localrepo newlocalrepo
``` |
3069256 | Why does Mercurial only have one level of rollback? | 16 | 2010-06-18 11:40:17 | <p>I understand the restrictions of rollback and the <a href="http://www.selenic.com/mercurial/hg.1.html#rollback" rel="noreferrer">care required in its use</a>, but I just wondered why there is only <em>one</em> level of rollback.</p>
<p>My guess it's a design decision and that the hassle of storing multiple previous... | 2,497 | 4,003 | 2012-01-18 10:45:13 | 3,070,861 | 13 | 2010-06-18 15:17:13 | 8,992 | 2010-06-18 15:17:13 | https://stackoverflow.com/q/3069256 | https://stackoverflow.com/a/3070861 | <p>There's only one level of rollback because rollback was never really intended as a feature. Rollback exists, and has it's odd name, because it grew out of mercurial's commit/push/pull transaction system.</p>
<p>If a network push is coming in and it gets 99% done and then the connection is lost the repository shoul... | <p>There's only one level of rollback because rollback was never really intended as a feature. Rollback exists, and has it's odd name, because it grew out of mercurial's commit/push/pull transaction system.</p> <p>If a network push is coming in and it gets 99% done and then the connection is lost the repository shoul... | 802, 12196 | mercurial, rollback | <h1>Why does Mercurial only have one level of rollback?</h1>
<p>I understand the restrictions of rollback and the <a href="http://www.selenic.com/mercurial/hg.1.html#rollback" rel="noreferrer">care required in its use</a>, but I just wondered why there is only <em>one</em> level of rollback.</p>
<p>My guess it's a des... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,284 | mercurial | # Why does Mercurial only have one level of rollback?
I understand the restrictions of rollback and the [care required in its use](http://www.selenic.com/mercurial/hg.1.html#rollback), but I just wondered why there is only *one* level of rollback.
My guess it's a design decision and that the hassle of storing multipl... | There's only one level of rollback because rollback was never really intended as a feature. Rollback exists, and has it's odd name, because it grew out of mercurial's commit/push/pull transaction system.
If a network push is coming in and it gets 99% done and then the connection is lost the repository shouldn't be lef... |
811999 | Combine DVCS with Visual Source Safe | 16 | 2009-05-01 16:00:54 | <p>I'm forced to use Visual Source Safe 2005 at work. I'd like to combine that with a DVCS, so that I can check in files locally without disrupting my co-workers if there's a bug or it doesn't compile.</p>
<p>In my attempts with Mercurial, it works, but causes a few weird issues. Namely, it thinks someone else has che... | 1,716 | 26,149 | 2010-12-07 15:04:26 | 953,335 | 13 | 2009-06-04 21:53:43 | 24,165 | 2009-06-04 21:53:43 | https://stackoverflow.com/q/811999 | https://stackoverflow.com/a/953335 | <p>WBlasko</p>
<p>I've found the same problem. I wanted to change files and merge them when needed instead of waiting for some other developer to unlock it. The solution that worked for me was:</p>
<p>1) Get the latest version of a VSS project (I placed all VSS projects under vss):</p>
<pre><code>c:\vss\projectA
</c... | <p>WBlasko</p> <p>I've found the same problem. I wanted to change files and merge them when needed instead of waiting for some other developer to unlock it. The solution that worked for me was:</p> <p>1) Get the latest version of a VSS project (I placed all VSS projects under vss):</p> <pre><code>c:\vss\projectA </c... | 802, 3346, 3678, 57243 | dvcs, mercurial, visual-sourcesafe, visual-sourcesafe-2005 | <h1>Combine DVCS with Visual Source Safe</h1>
<p>I'm forced to use Visual Source Safe 2005 at work. I'd like to combine that with a DVCS, so that I can check in files locally without disrupting my co-workers if there's a bug or it doesn't compile.</p>
<p>In my attempts with Mercurial, it works, but causes a few weird ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,285 | mercurial | # Combine DVCS with Visual Source Safe
I'm forced to use Visual Source Safe 2005 at work. I'd like to combine that with a DVCS, so that I can check in files locally without disrupting my co-workers if there's a bug or it doesn't compile.
In my attempts with Mercurial, it works, but causes a few weird issues. Namely, ... | WBlasko
I've found the same problem. I wanted to change files and merge them when needed instead of waiting for some other developer to unlock it. The solution that worked for me was:
1) Get the latest version of a VSS project (I placed all VSS projects under vss):
```
c:\vss\projectA
```
2A) Initialize with Mercur... |
8643612 | How to make 'hg log --verbose' show files on multiple lines? | 14 | 2011-12-27 10:28:32 | <p>By default all files changed in a changeset are on the same line, which makes them very easily to skip one or two, and hard to read.</p>
<p>How to make each file show on its own separate line?</p>
| 6,315 | 62,699 | 2015-02-13 18:20:12 | 8,643,761 | 13 | 2011-12-27 10:44:47 | 110,204 | 2011-12-27 11:03:56 | https://stackoverflow.com/q/8643612 | https://stackoverflow.com/a/8643761 | <p>The real way to see information about changed <em>files</em> is to use <code>hg status</code>. This shows the files that were modified in revision 100:</p>
<pre><code>$ hg status -c 100
</code></pre>
<p>But if you want to have the log messages as well, then <code>hg log</code> is of course a natural starting point... | <p>The real way to see information about changed <em>files</em> is to use <code>hg status</code>. This shows the files that were modified in revision 100:</p> <pre><code>$ hg status -c 100 </code></pre> <p>But if you want to have the log messages as well, then <code>hg log</code> is of course a natural starting point... | 802, 2216 | mercurial, windows-xp | <h1>How to make 'hg log --verbose' show files on multiple lines?</h1>
<p>By default all files changed in a changeset are on the same line, which makes them very easily to skip one or two, and hard to read.</p>
<p>How to make each file show on its own separate line?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,286 | mercurial | # How to make 'hg log --verbose' show files on multiple lines?
By default all files changed in a changeset are on the same line, which makes them very easily to skip one or two, and hard to read.
How to make each file show on its own separate line? | The real way to see information about changed *files* is to use `hg status`. This shows the files that were modified in revision 100:
```
$ hg status -c 100
```
But if you want to have the log messages as well, then `hg log` is of course a natural starting point. Unfortunately there is *no built-in switch* that will ... |
19168096 | hg shows files modified that are unchanged, why might that be? | 13 | 2013-10-03 19:54:55 | <p>My question is this: what might be causing Mercurial to indicate (via "status" or TortoiseHgWorkbench) files as "Modified" when they are unchanged?</p>
<p>Here's the situation: I have a repository local to a Linux machine. I only work with the repository on the Linux machine. I do, however, have an exact copy of ... | 4,502 | 1,171,538 | 2015-11-16 21:36:52 | 19,169,888 | 13 | 2013-10-03 21:53:36 | 112,053 | 2013-10-03 21:53:36 | https://stackoverflow.com/q/19168096 | https://stackoverflow.com/a/19169888 | <p>A file can be marked as modified when the Unix permissions are changed, too.
Try <code>hg diff -g</code> to check for the permissions.</p>
| <p>A file can be marked as modified when the Unix permissions are changed, too. Try <code>hg diff -g</code> to check for the permissions.</p> | 802, 8122 | mercurial, tortoisehg | <h1>hg shows files modified that are unchanged, why might that be?</h1>
<p>My question is this: what might be causing Mercurial to indicate (via "status" or TortoiseHgWorkbench) files as "Modified" when they are unchanged?</p>
<p>Here's the situation: I have a repository local to a Linux machine. I only work with the... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,287 | mercurial | # hg shows files modified that are unchanged, why might that be?
My question is this: what might be causing Mercurial to indicate (via "status" or TortoiseHgWorkbench) files as "Modified" when they are unchanged?
Here's the situation: I have a repository local to a Linux machine. I only work with the repository on th... | A file can be marked as modified when the Unix permissions are changed, too.
Try `hg diff -g` to check for the permissions. |
9293085 | Mercurial: get information about repositories without cloning them | 13 | 2012-02-15 12:08:36 | <p>Few days ago I started experimenting with Mercurial, and everything went great, until I decided to try writting a small program, that gets the list of repositories and lists of changeset IDs for each repository from a remote server, allows the user to pick repository and changeset, clones it and updates to the chose... | 5,759 | 1,211,213 | 2017-06-19 11:35:10 | 9,293,727 | 13 | 2012-02-15 12:50:36 | 110,204 | 2017-06-19 11:35:10 | https://stackoverflow.com/q/9293085 | https://stackoverflow.com/a/9293727 | <p>No, Mercurial is designed so that you need a <em>local</em> repository for almost all commands. The only built-in command that will give you information about a remote repository is <code>hg id</code>:</p>
<pre><code>$ hg id https://bitbucket.org/aragost/javahg/
3b2711b26dbd
</code></pre>
<p>To get hold of more in... | <p>No, Mercurial is designed so that you need a <em>local</em> repository for almost all commands. The only built-in command that will give you information about a remote repository is <code>hg id</code>:</p> <pre><code>$ hg id https://bitbucket.org/aragost/javahg/ 3b2711b26dbd </code></pre> <p>To get hold of more in... | 802, 7330 | mercurial, repository | <h1>Mercurial: get information about repositories without cloning them</h1>
<p>Few days ago I started experimenting with Mercurial, and everything went great, until I decided to try writting a small program, that gets the list of repositories and lists of changeset IDs for each repository from a remote server, allows t... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,288 | mercurial | # Mercurial: get information about repositories without cloning them
Few days ago I started experimenting with Mercurial, and everything went great, until I decided to try writting a small program, that gets the list of repositories and lists of changeset IDs for each repository from a remote server, allows the user t... | No, Mercurial is designed so that you need a *local* repository for almost all commands. The only built-in command that will give you information about a remote repository is `hg id`:
```
$ hg id https://bitbucket.org/aragost/javahg/
3b2711b26dbd
```
To get hold of more information you can sometimes exploit the `raw`... |
8824597 | How are version control histories stored and calculated? | 13 | 2012-01-11 18:26:03 | <p>Consider this simple python code, which demonstrates a very simple version control design for a dictonary:</p>
<pre><code>def build_current(history):
current = {}
for action, key, value in history:
assert action in ('set', 'del')
if action == 'set':
current[key] = value
e... | 2,847 | 565,879 | 2012-07-16 09:54:28 | 8,826,605 | 13 | 2012-01-11 21:05:16 | 23,264 | 2012-07-16 09:54:28 | https://stackoverflow.com/q/8824597 | https://stackoverflow.com/a/8826605 | <p>You mentioned these 3 methods of storing (file)-history:</p>
<ol>
<li><strong>patch</strong> : a patch is the (usually textual, but binary patches are also possible) representation of the difference between two files. It is the output of unix command <em>diff</em> and can be applied by unix command <em>patch</em>. ... | <p>You mentioned these 3 methods of storing (file)-history:</p> <ol> <li><strong>patch</strong> : a patch is the (usually textual, but binary patches are also possible) representation of the difference between two files. It is the output of unix command <em>diff</em> and can be applied by unix command <em>patch</em>. ... | 16, 63, 119, 456, 802 | git, mercurial, python, svn, version-control | <h1>How are version control histories stored and calculated?</h1>
<p>Consider this simple python code, which demonstrates a very simple version control design for a dictonary:</p>
<pre><code>def build_current(history):
current = {}
for action, key, value in history:
assert action in ('set', 'del')
... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,289 | mercurial | # How are version control histories stored and calculated?
Consider this simple python code, which demonstrates a very simple version control design for a dictonary:
```
def build_current(history):
current = {}
for action, key, value in history:
assert action in ('set', 'del')
if action == 'se... | You mentioned these 3 methods of storing (file)-history:
1. **patch** : a patch is the (usually textual, but binary patches are also possible) representation of the difference between two files. It is the output of unix command *diff* and can be applied by unix command *patch*. A lot of versioning systems are using pa... |
831645 | Cloning mercurial repo to the remote host | 13 | 2009-05-06 20:43:00 | <p>Mercurial supports push-style cloning of repositories to remote hosts, however newly cloned repositories don't contain working copies. Is there any 'hidden' option to make mercurial call update upon these cloned repos?</p>
<p>Here is an example:</p>
<p>1) hg init hello</p>
<p>2) hg clone hello ssh://somehost/hell... | 5,037 | 47,422 | 2011-03-23 19:36:34 | 837,173 | 13 | 2009-05-07 21:40:32 | 1,959 | 2011-03-23 19:36:34 | https://stackoverflow.com/q/831645 | https://stackoverflow.com/a/837173 | <p>You can create a hook on the receiving side. Add the following section to your repo/.hg/hgrc</p>
<pre><code>[hooks]
changegroup = hg update
</code></pre>
<p>That should do it. Note that hooks are not cloned. </p>
| <p>You can create a hook on the receiving side. Add the following section to your repo/.hg/hgrc</p> <pre><code>[hooks] changegroup = hg update </code></pre> <p>That should do it. Note that hooks are not cloned. </p> | 802 | mercurial | <h1>Cloning mercurial repo to the remote host</h1>
<p>Mercurial supports push-style cloning of repositories to remote hosts, however newly cloned repositories don't contain working copies. Is there any 'hidden' option to make mercurial call update upon these cloned repos?</p>
<p>Here is an example:</p>
<p>1) hg init ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,290 | mercurial | # Cloning mercurial repo to the remote host
Mercurial supports push-style cloning of repositories to remote hosts, however newly cloned repositories don't contain working copies. Is there any 'hidden' option to make mercurial call update upon these cloned repos?
Here is an example:
1) hg init hello
2) hg clone hell... | You can create a hook on the receiving side. Add the following section to your repo/.hg/hgrc
```
[hooks]
changegroup = hg update
```
That should do it. Note that hooks are not cloned. |
5080291 | Mercurial - should .hgtags be merged? | 12 | 2011-02-22 15:40:27 | <p>If you are merging changes from repository B into repository A should you merge changes in .hgtags? </p>
<p>Repository B could have had tags 1.01, 1.02, 1.03 which are not in A. Why would you ever merge those into repository A's .hgtags file? If we merged and then tried to view repository A by looking at tag 1.0... | 2,879 | 47,281 | 2017-01-02 02:37:31 | 5,080,362 | 13 | 2011-02-22 15:46:38 | 257,250 | 2011-02-22 15:58:34 | https://stackoverflow.com/q/5080291 | https://stackoverflow.com/a/5080362 | <p>Short Answer: This does work properly and you should merge <code>.hgtags</code></p>
<p>Why should you actually merge <code>.hgtags</code> and why does it make sense?</p>
<p>So you have</p>
<ul>
<li>Repo A with Changesets 3 (a1), 4 (a2), 5 (a3) </li>
<li>Repo B with Changesets 3 (b1), 4 (b2), 5 (b3) tag 1.01</li>
... | <p>Short Answer: This does work properly and you should merge <code>.hgtags</code></p> <p>Why should you actually merge <code>.hgtags</code> and why does it make sense?</p> <p>So you have</p> <ul> <li>Repo A with Changesets 3 (a1), 4 (a2), 5 (a3) </li> <li>Repo B with Changesets 3 (b1), 4 (b2), 5 (b3) tag 1.01</li> ... | 717, 802, 66286 | .hgtags, mercurial, merge | <h1>Mercurial - should .hgtags be merged?</h1>
<p>If you are merging changes from repository B into repository A should you merge changes in .hgtags? </p>
<p>Repository B could have had tags 1.01, 1.02, 1.03 which are not in A. Why would you ever merge those into repository A's .hgtags file? If we merged and then t... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,291 | mercurial | # Mercurial - should .hgtags be merged?
If you are merging changes from repository B into repository A should you merge changes in .hgtags?
Repository B could have had tags 1.01, 1.02, 1.03 which are not in A. Why would you ever merge those into repository A's .hgtags file? If we merged and then tried to view reposit... | Short Answer: This does work properly and you should merge `.hgtags`
Why should you actually merge `.hgtags` and why does it make sense?
So you have
- Repo A with Changesets 3 (a1), 4 (a2), 5 (a3)
- Repo B with Changesets 3 (b1), 4 (b2), 5 (b3) tag 1.01
The above is listed as the Changeset Number (long unique hex i... |
2210403 | Testing for uncommitted changes in mercurial | 12 | 2010-02-05 21:03:36 | <p>What's the best way to check in script if there're uncommitted changes in mercurial's working tree.</p>
<p>(the way I would with <code>git diff --quiet</code> in git)</p>
| 8,976 | 237,105 | 2018-02-12 10:07:59 | 2,212,128 | 13 | 2010-02-06 04:58:46 | 8,992 | 2010-02-06 04:58:46 | https://stackoverflow.com/q/2210403 | https://stackoverflow.com/a/2212128 | <p>In mercurial 1.4 and later you can use the summary command, which gives output like this when changes exist:</p>
<pre><code>$ hg summary
parent: 0:ad218537bdef tip
commited
branch: default
commit: 1 modified
update: (current)
</code></pre>
<p>and this post-commit:</p>
<pre><code>$ hg summary
parent: 1:ef93d692f6... | <p>In mercurial 1.4 and later you can use the summary command, which gives output like this when changes exist:</p> <pre><code>$ hg summary parent: 0:ad218537bdef tip commited branch: default commit: 1 modified update: (current) </code></pre> <p>and this post-commit:</p> <pre><code>$ hg summary parent: 1:ef93d692f6... | 802 | mercurial | <h1>Testing for uncommitted changes in mercurial</h1>
<p>What's the best way to check in script if there're uncommitted changes in mercurial's working tree.</p>
<p>(the way I would with <code>git diff --quiet</code> in git)</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,292 | mercurial | # Testing for uncommitted changes in mercurial
What's the best way to check in script if there're uncommitted changes in mercurial's working tree.
(the way I would with `git diff --quiet` in git) | In mercurial 1.4 and later you can use the summary command, which gives output like this when changes exist:
```
$ hg summary
parent: 0:ad218537bdef tip
commited
branch: default
commit: 1 modified
update: (current)
```
and this post-commit:
```
$ hg summary
parent: 1:ef93d692f646 tip
sfsdf
branch: default
commit: ... |
22801310 | How to determine which rule is causing a file to be ignored in Mercurial? | 10 | 2014-04-02 04:01:19 | <p>Mercurial is presently ignoring a file which I believe shouldn't be ignored. The <code>.hgignore</code> file is remarkably large, and after a cursory read-through it's not obvious which rule(s) is/are the culprit.</p>
<p>Is there a way to get Mercurial to tell me which rules in the .hgignore (if any) match a file?<... | 916 | 203,705 | 2019-09-11 11:05:26 | 22,803,261 | 13 | 2014-04-02 06:33:38 | 1,105,235 | 2019-09-11 11:05:26 | https://stackoverflow.com/q/22801310 | https://stackoverflow.com/a/22803261 | <p>You can't do this out of the box, but you can write Mercurial extension for this.</p>
<p>I've written extension <a href="https://bitbucket.org/rpeshkov/hg-isignored" rel="nofollow noreferrer">hg-isignored</a> that can show you which rules in .hgignore match specified folder or file.</p>
<p><strong>Installation</st... | <p>You can't do this out of the box, but you can write Mercurial extension for this.</p> <p>I've written extension <a href="https://bitbucket.org/rpeshkov/hg-isignored" rel="nofollow noreferrer">hg-isignored</a> that can show you which rules in .hgignore match specified folder or file.</p> <p><strong>Installation</st... | 802, 31419 | hgignore, mercurial | <h1>How to determine which rule is causing a file to be ignored in Mercurial?</h1>
<p>Mercurial is presently ignoring a file which I believe shouldn't be ignored. The <code>.hgignore</code> file is remarkably large, and after a cursory read-through it's not obvious which rule(s) is/are the culprit.</p>
<p>Is there a w... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,295 | mercurial | # How to determine which rule is causing a file to be ignored in Mercurial?
Mercurial is presently ignoring a file which I believe shouldn't be ignored. The `.hgignore` file is remarkably large, and after a cursory read-through it's not obvious which rule(s) is/are the culprit.
Is there a way to get Mercurial to tell... | You can't do this out of the box, but you can write Mercurial extension for this.
I've written extension [hg-isignored](https://bitbucket.org/rpeshkov/hg-isignored) that can show you which rules in .hgignore match specified folder or file.
**Installation**
Clone extension source somewhere, i.e. in `~/.hgrc.d/hg-isig... |
6132671 | How to do a quick push with Mercurial | 10 | 2011-05-26 01:04:10 | <p>After a change in my local repo, I commit with <code>hg commit -m <message></code>, then I push to my server with <code>hg push</code>, then in my server I update working dir with <code>hg update</code>.</p>
<p>Is there a better way to do this?</p>
| 18,348 | 719,127 | 2011-05-27 11:43:04 | 6,132,825 | 13 | 2011-05-26 01:37:38 | 137,688 | 2011-05-27 11:43:04 | https://stackoverflow.com/q/6132671 | https://stackoverflow.com/a/6132825 | <p>The first two steps you have described:</p>
<pre><code>hg commit -m <message>
hg push
</code></pre>
<p>are required as per the fact that commits are kept completely separate from the server in Mercurial (and most other DVCS as well). You could write a post-commit hook to perform the push after each commit, b... | <p>The first two steps you have described:</p> <pre><code>hg commit -m <message> hg push </code></pre> <p>are required as per the fact that commits are kept completely separate from the server in Mercurial (and most other DVCS as well). You could write a post-commit hook to perform the push after each commit, b... | 802 | mercurial | <h1>How to do a quick push with Mercurial</h1>
<p>After a change in my local repo, I commit with <code>hg commit -m <message></code>, then I push to my server with <code>hg push</code>, then in my server I update working dir with <code>hg update</code>.</p>
<p>Is there a better way to do this?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,297 | mercurial | # How to do a quick push with Mercurial
After a change in my local repo, I commit with `hg commit -m <message>`, then I push to my server with `hg push`, then in my server I update working dir with `hg update`.
Is there a better way to do this? | The first two steps you have described:
```
hg commit -m <message>
hg push
```
are required as per the fact that commits are kept completely separate from the server in Mercurial (and most other DVCS as well). You could write a post-commit hook to perform the push after each commit, but this is not advised because it... |
16143044 | Mercurial: list users that have worked on repository | 9 | 2013-04-22 08:56:04 | <p>I'm using Mercurial through TortoiseHG. I would like to see what users have worked on a repository. Preferrably just a list of unique user names. However it's not practical to scroll down the (long) list of revisions and noting each name. I could probably solve this with grep but I'm on windows and prefer to avoid i... | 2,019 | 2,074,832 | 2013-04-22 09:36:34 | 16,143,820 | 13 | 2013-04-22 09:36:34 | 501,710 | 2013-04-22 09:36:34 | https://stackoverflow.com/q/16143044 | https://stackoverflow.com/a/16143820 | <p>If you have PowerShell installed then this does the trick:</p>
<pre><code>hg log --template "{author}\n" | Select -Unique
</code></pre>
<p>It takes two or three seconds for my current repository of about 5500 changesets.</p>
| <p>If you have PowerShell installed then this does the trick:</p> <pre><code>hg log --template "{author}\n" | Select -Unique </code></pre> <p>It takes two or three seconds for my current repository of about 5500 changesets.</p> | 802 | mercurial | <h1>Mercurial: list users that have worked on repository</h1>
<p>I'm using Mercurial through TortoiseHG. I would like to see what users have worked on a repository. Preferrably just a list of unique user names. However it's not practical to scroll down the (long) list of revisions and noting each name. I could probably... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,299 | mercurial | # Mercurial: list users that have worked on repository
I'm using Mercurial through TortoiseHG. I would like to see what users have worked on a repository. Preferrably just a list of unique user names. However it's not practical to scroll down the (long) list of revisions and noting each name. I could probably solve th... | If you have PowerShell installed then this does the trick:
```
hg log --template "{author}\n" | Select -Unique
```
It takes two or three seconds for my current repository of about 5500 changesets. |
16060643 | How to undo "hg qnew"? | 9 | 2013-04-17 12:55:48 | <p>I issued <code>hg qnew</code> without realizing that it includes any outstanding changes into the patch. I'd like to back that out and pick only specific changes using <code>hg qrecord</code>. How can I undo <code>qnew</code>?</p>
| 1,263 | 1,333,025 | 2013-04-22 07:51:56 | 16,076,957 | 13 | 2013-04-18 07:28:12 | 110,204 | 2013-04-18 07:28:12 | https://stackoverflow.com/q/16060643 | https://stackoverflow.com/a/16076957 | <p>Your answer definitely works — with newer Mercurial's you can use <code>hg strip --keep</code> to avoid doing the import step:</p>
<pre><code>$ hg strip --keep .
$ hg qdelete patch-name
</code></pre>
<p>The <code>--keep</code> flag makes strip ignore the working copy while working, that is, it deletes the commit (... | <p>Your answer definitely works — with newer Mercurial's you can use <code>hg strip --keep</code> to avoid doing the import step:</p> <pre><code>$ hg strip --keep . $ hg qdelete patch-name </code></pre> <p>The <code>--keep</code> flag makes strip ignore the working copy while working, that is, it deletes the commit (... | 802, 5766, 32068, 61149 | backout, mercurial, mercurial-queue, undo | <h1>How to undo "hg qnew"?</h1>
<p>I issued <code>hg qnew</code> without realizing that it includes any outstanding changes into the patch. I'd like to back that out and pick only specific changes using <code>hg qrecord</code>. How can I undo <code>qnew</code>?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,300 | mercurial | # How to undo "hg qnew"?
I issued `hg qnew` without realizing that it includes any outstanding changes into the patch. I'd like to back that out and pick only specific changes using `hg qrecord`. How can I undo `qnew`? | Your answer definitely works — with newer Mercurial's you can use `hg strip --keep` to avoid doing the import step:
```
$ hg strip --keep .
$ hg qdelete patch-name
```
The `--keep` flag makes strip ignore the working copy while working, that is, it deletes the commit (like `hg qpop` would do) but it doesn't undo the ... |
9664864 | MQ vs. branches in Mercurial | 9 | 2012-03-12 09:53:24 | <p>I've been working with Mercurial now for some time. When making (private) changes to some third party software, in the past I always created a separate named branch for these changes. When the upstream code updates, I simply merge it into my named branch. </p>
<p>Today I read about MQ (Mercurial Queues - chapters <... | 1,516 | 614,177 | 2018-02-22 12:32:25 | 9,666,316 | 13 | 2012-03-12 11:36:56 | 110,204 | 2018-02-22 12:32:25 | https://stackoverflow.com/q/9664864 | https://stackoverflow.com/a/9666316 | <p>The main advantage of MQ over named branches are:</p>
<ul>
<li><p>You can revise your patches. This lets you edit history and so you can maintain a clean and logical series of patches on top of the upstream code: if you notice a mistake in a patch you refresh the patch instead of making a new commit.</p></li>
<li><... | <p>The main advantage of MQ over named branches are:</p> <ul> <li><p>You can revise your patches. This lets you edit history and so you can maintain a clean and logical series of patches on top of the upstream code: if you notice a mistake in a patch you refresh the patch instead of making a new commit.</p></li> <li><... | 802, 1879, 3346, 32068 | branch, dvcs, mercurial, mercurial-queue | <h1>MQ vs. branches in Mercurial</h1>
<p>I've been working with Mercurial now for some time. When making (private) changes to some third party software, in the past I always created a separate named branch for these changes. When the upstream code updates, I simply merge it into my named branch. </p>
<p>Today I read a... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,301 | mercurial | # MQ vs. branches in Mercurial
I've been working with Mercurial now for some time. When making (private) changes to some third party software, in the past I always created a separate named branch for these changes. When the upstream code updates, I simply merge it into my named branch.
Today I read about MQ (Mercuria... | The main advantage of MQ over named branches are:
- You can revise your patches. This lets you edit history and so you can maintain a clean and logical series of patches on top of the upstream code: if you notice a mistake in a patch you refresh the patch instead of making a new commit.
- The changes in your patches w... |
14129263 | Mercurial Stop Tracking and Ignore | 8 | 2013-01-02 21:14:27 | <p>When it comes to Mercurial;</p>
<p>What exactly is the difference between the following:</p>
<ul>
<li>Stop Tracking</li>
<li>Ignore</li>
</ul>
<p>Google Search, SE search brings no clear examples / results on the matter.</p>
| 5,291 | 853,934 | 2013-09-30 16:05:12 | 14,129,535 | 13 | 2013-01-02 21:34:10 | 1,106,367 | 2013-01-02 21:40:22 | https://stackoverflow.com/q/14129263 | https://stackoverflow.com/a/14129535 | <p>Generally speaking, as it isn't clear in what context you came across those terms:</p>
<ul>
<li><p><a href="http://hgbook.red-bean.com/read/file-names-and-pattern-matching.html#id382104" rel="nofollow noreferrer"><strong>Ignore</strong></a> adds a file name pattern to the <code>.hgignore</code> file. It means any f... | <p>Generally speaking, as it isn't clear in what context you came across those terms:</p> <ul> <li><p><a href="http://hgbook.red-bean.com/read/file-names-and-pattern-matching.html#id382104" rel="nofollow noreferrer"><strong>Ignore</strong></a> adds a file name pattern to the <code>.hgignore</code> file. It means any f... | 456, 802, 90056 | atlassian-sourcetree, mercurial, version-control | <h1>Mercurial Stop Tracking and Ignore</h1>
<p>When it comes to Mercurial;</p>
<p>What exactly is the difference between the following:</p>
<ul>
<li>Stop Tracking</li>
<li>Ignore</li>
</ul>
<p>Google Search, SE search brings no clear examples / results on the matter.</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,302 | mercurial | # Mercurial Stop Tracking and Ignore
When it comes to Mercurial;
What exactly is the difference between the following:
- Stop Tracking
- Ignore
Google Search, SE search brings no clear examples / results on the matter. | Generally speaking, as it isn't clear in what context you came across those terms:
- [**Ignore**](http://hgbook.red-bean.com/read/file-names-and-pattern-matching.html#id382104) adds a file name pattern to the `.hgignore` file. It means any files matching the pattern will not be version controlled ***unless** they have... |
4317857 | Branching in Mercurial | 8 | 2010-11-30 19:49:13 | <p>I have starting using Mercurial for my (our) versioning needs. I have now come to the point that I need to create a feature branch. However, now that I have started working on it -- and I try to push my changes, I keep getting a warning about new remote heads. That's stupid, I know that there will be new remote head... | 1,928 | 283,055 | 2012-02-15 19:23:52 | 4,317,980 | 13 | 2010-11-30 20:03:28 | 63,147 | 2012-02-15 19:23:52 | https://stackoverflow.com/q/4317857 | https://stackoverflow.com/a/4317980 | <p>To date, the best guide out there is Steve Losh's "<a href="http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/" rel="nofollow noreferrer">A Guide to Branching in Mercurial</a>".</p>
<p>Mercurial will always complain about creating new heads on the remote. You must use either <code>--force</code> ... | <p>To date, the best guide out there is Steve Losh's "<a href="http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/" rel="nofollow noreferrer">A Guide to Branching in Mercurial</a>".</p> <p>Mercurial will always complain about creating new heads on the remote. You must use either <code>--force</code> ... | 802, 1879, 3346 | branch, dvcs, mercurial | <h1>Branching in Mercurial</h1>
<p>I have starting using Mercurial for my (our) versioning needs. I have now come to the point that I need to create a feature branch. However, now that I have started working on it -- and I try to push my changes, I keep getting a warning about new remote heads. That's stupid, I know th... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,303 | mercurial | # Branching in Mercurial
I have starting using Mercurial for my (our) versioning needs. I have now come to the point that I need to create a feature branch. However, now that I have started working on it -- and I try to push my changes, I keep getting a warning about new remote heads. That's stupid, I know that there ... | To date, the best guide out there is Steve Losh's "[A Guide to Branching in Mercurial](http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/)".
Mercurial will always complain about creating new heads on the remote. You must use either `--force` or `--new-branch` when creating a new head.
When using Tor... |
3971961 | Removing changesets or shrinking a Mercurial repository | 8 | 2010-10-19 19:29:51 | <p>How can I shrink a mercurial repository by removing old changesets?</p>
| 2,642 | 399,113 | 2013-08-10 19:52:19 | 3,972,317 | 13 | 2010-10-19 20:11:16 | 8,992 | 2013-08-10 19:08:18 | https://stackoverflow.com/q/3971961 | https://stackoverflow.com/a/3972317 | <p>Fundamentally, you can't. Mercurial has a hard and fast rule that a changeset can only exist in a repository if every one of its ancestor changesets also exists in that repository.</p>
<p>You can, however, create a new repository whose changesets correspond to a subset of the later changesets in another repository.... | <p>Fundamentally, you can't. Mercurial has a hard and fast rule that a changeset can only exist in a repository if every one of its ancestor changesets also exists in that repository.</p> <p>You can, however, create a new repository whose changesets correspond to a subset of the later changesets in another repository.... | 802 | mercurial | <h1>Removing changesets or shrinking a Mercurial repository</h1>
<p>How can I shrink a mercurial repository by removing old changesets?</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,304 | mercurial | # Removing changesets or shrinking a Mercurial repository
How can I shrink a mercurial repository by removing old changesets? | Fundamentally, you can't. Mercurial has a hard and fast rule that a changeset can only exist in a repository if every one of its ancestor changesets also exists in that repository.
You can, however, create a new repository whose changesets correspond to a subset of the later changesets in another repository. They won'... |
1871522 | Mercurial - How do I create a .zip of files changed between two revisions? | 8 | 2009-12-09 04:06:23 | <p>I have a personal Mercurial repository tracking some changes I am working on. I'd like to share these changes with a collaborator, however they don't have/can't get Mercurial, so I need to send the entire file set and the collaborator will merge on their end. I am looking for a way to extract the "tip" version of ... | 5,022 | 1,541 | 2014-02-06 14:56:17 | 2,668,152 | 13 | 2010-04-19 14:25:19 | 37,078 | 2010-04-19 14:25:19 | https://stackoverflow.com/q/1871522 | https://stackoverflow.com/a/2668152 | <p>The best case scenario is to put the proper pressure on these folks to get Mercurial, but barring that, a patch is probably better than a zipped set of files, since the patch will track deletes and renames. If you still want a zip file, I've written a short script that makes a zip file:</p>
<pre><code>import os, s... | <p>The best case scenario is to put the proper pressure on these folks to get Mercurial, but barring that, a patch is probably better than a zipped set of files, since the patch will track deletes and renames. If you still want a zip file, I've written a short script that makes a zip file:</p> <pre><code>import os, s... | 802, 4167 | export, mercurial | <h1>Mercurial - How do I create a .zip of files changed between two revisions?</h1>
<p>I have a personal Mercurial repository tracking some changes I am working on. I'd like to share these changes with a collaborator, however they don't have/can't get Mercurial, so I need to send the entire file set and the collaborat... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,305 | mercurial | # Mercurial - How do I create a .zip of files changed between two revisions?
I have a personal Mercurial repository tracking some changes I am working on. I'd like to share these changes with a collaborator, however they don't have/can't get Mercurial, so I need to send the entire file set and the collaborator will me... | The best case scenario is to put the proper pressure on these folks to get Mercurial, but barring that, a patch is probably better than a zipped set of files, since the patch will track deletes and renames. If you still want a zip file, I've written a short script that makes a zip file:
```
import os, subprocess, sys
... |
919685 | How would you use a DVCS (mercurial in my case) to develop for different versions of the .NET framework? | 8 | 2009-05-28 07:52:19 | <p>I'm writing some sort of new adminstration dashboard for our cms (which runs on asp.net webforms). Some of our older servers can only handle .NET 2.0 for various reasons so I'd have to rewrite my code which uses lambda expressions etc. for that.</p>
<p>I wonder how you would use a dvcs like mercurial to develop tho... | 363 | 13,466 | 2018-02-22 12:32:58 | 919,858 | 13 | 2009-05-28 08:52:14 | 110,204 | 2018-02-22 12:32:58 | https://stackoverflow.com/q/919685 | https://stackoverflow.com/a/919858 | <p>Yes, you can use Mercurial for this. Here is how it would work.</p>
<p>Let's say that your current clone is called <code>new-dot-net</code> since it
support the new .Net version. You make a clone of it and call it
<code>old-dot-net</code> or something like that. The two clones are now identical
and both target .Net... | <p>Yes, you can use Mercurial for this. Here is how it would work.</p> <p>Let's say that your current clone is called <code>new-dot-net</code> since it support the new .Net version. You make a clone of it and call it <code>old-dot-net</code> or something like that. The two clones are now identical and both target .Net... | 1, 96, 456, 802, 3346 | .net, asp.net, dvcs, mercurial, version-control | <h1>How would you use a DVCS (mercurial in my case) to develop for different versions of the .NET framework?</h1>
<p>I'm writing some sort of new adminstration dashboard for our cms (which runs on asp.net webforms). Some of our older servers can only handle .NET 2.0 for various reasons so I'd have to rewrite my code wh... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,306 | mercurial | # How would you use a DVCS (mercurial in my case) to develop for different versions of the .NET framework?
I'm writing some sort of new adminstration dashboard for our cms (which runs on asp.net webforms). Some of our older servers can only handle .NET 2.0 for various reasons so I'd have to rewrite my code which uses ... | Yes, you can use Mercurial for this. Here is how it would work.
Let's say that your current clone is called `new-dot-net` since it
support the new .Net version. You make a clone of it and call it
`old-dot-net` or something like that. The two clones are now identical
and both target .Net 3.5.
Now carefully make small ... |
14185194 | how to enable hg rebase | 7 | 2013-01-06 18:15:26 | <p>I added these lines to hgrc in my .hg folder:</p>
<pre><code>[extension]
rebase =
</code></pre>
<p>but hg rebase still returns an error: Unknow command 'rebase'.
It may be a dumb question but do I need to include the path to rebase extension after the "=" ? and if yes, where can I find the extension's location?</... | 2,516 | 1,481,508 | 2013-01-06 18:55:35 | 14,185,583 | 13 | 2013-01-06 18:55:35 | 501,710 | 2013-01-06 18:55:35 | https://stackoverflow.com/q/14185194 | https://stackoverflow.com/a/14185583 | <p>The heading for the section should be <code>extensions</code>, not <code>extension</code>. </p>
| <p>The heading for the section should be <code>extensions</code>, not <code>extension</code>. </p> | 802, 8974 | mercurial, rebase | <h1>how to enable hg rebase</h1>
<p>I added these lines to hgrc in my .hg folder:</p>
<pre><code>[extension]
rebase =
</code></pre>
<p>but hg rebase still returns an error: Unknow command 'rebase'.
It may be a dumb question but do I need to include the path to rebase extension after the "=" ? and if yes, where can I... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,307 | mercurial | # how to enable hg rebase
I added these lines to hgrc in my .hg folder:
```
[extension]
rebase =
```
but hg rebase still returns an error: Unknow command 'rebase'.
It may be a dumb question but do I need to include the path to rebase extension after the "=" ? and if yes, where can I find the extension's location? | The heading for the section should be `extensions`, not `extension`. |
5906629 | Mercurial, revert files to a past revision by wildcard? | 7 | 2011-05-06 04:00:26 | <pre><code>hg revert -r 4 -I *.aspx
</code></pre>
<p>isn't working for me. Any help? And no, I don't want to use TortoiseHG.</p>
| 1,705 | 734,691 | 2020-07-21 20:49:25 | 5,906,648 | 13 | 2011-05-06 04:04:08 | 19,465 | 2020-07-21 20:48:57 | https://stackoverflow.com/q/5906629 | https://stackoverflow.com/a/5906648 | <p>Try <code>hg revert -r 4 -I **/*.aspx</code> <em>from the root directory of the repository</em>. The <code>**.aspx</code> matches any file in any subdirectory in the repository whereas <code>*.aspx</code> only matches them in the current directory.</p>
<p>See <code>hg help patterns</code> for more information, whic... | <p>Try <code>hg revert -r 4 -I **/*.aspx</code> <em>from the root directory of the repository</em>. The <code>**.aspx</code> matches any file in any subdirectory in the repository whereas <code>*.aspx</code> only matches them in the current directory.</p> <p>See <code>hg help patterns</code> for more information, whic... | 802 | mercurial | <h1>Mercurial, revert files to a past revision by wildcard?</h1>
<pre><code>hg revert -r 4 -I *.aspx
</code></pre>
<p>isn't working for me. Any help? And no, I don't want to use TortoiseHG.</p>
| q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,308 | mercurial | # Mercurial, revert files to a past revision by wildcard?
```
hg revert -r 4 -I *.aspx
```
isn't working for me. Any help? And no, I don't want to use TortoiseHG. | Try `hg revert -r 4 -I **/*.aspx` *from the root directory of the repository*. The `**.aspx` matches any file in any subdirectory in the repository whereas `*.aspx` only matches them in the current directory.
See `hg help patterns` for more information, which I've just noticed shows a regexp-based alternative:
```
... |
781211 | How to set correct value for Django ROOT_URLCONF setting in different branches | 7 | 2009-04-23 10:54:32 | <p>I've put site directory created by <code>django-admin startproject</code> under version control (Mercurial). Let's say, the site is called <code>frobnicator</code>.</p>
<p>Now I want to make some serious refactoring, so I clone the site using command</p>
<pre><code>hg clone frobnicator frobnicator-refactoring`
</c... | 8,073 | 73,103 | 2022-02-17 20:27:26 | 781,404 | 13 | 2009-04-23 12:01:26 | 19,772 | 2022-02-17 20:27:26 | https://stackoverflow.com/q/781211 | https://stackoverflow.com/a/781404 | <p>Simply remove project name from the <code>ROOT_URLCONF</code> definition - it is optional. Then you can have project folders with different names.</p>
| <p>Simply remove project name from the <code>ROOT_URLCONF</code> definition - it is optional. Then you can have project folders with different names.</p> | 16, 243, 802 | django, mercurial, python | <h1>How to set correct value for Django ROOT_URLCONF setting in different branches</h1>
<p>I've put site directory created by <code>django-admin startproject</code> under version control (Mercurial). Let's say, the site is called <code>frobnicator</code>.</p>
<p>Now I want to make some serious refactoring, so I clone ... | q.PostTypeId = 1; a.PostTypeId = 2; EXISTS tag '%mercurial%' OR '%hg%'; a.Body contains code block; q.Score > 5; a.Score > 10 | 24,309 | mercurial | # How to set correct value for Django ROOT_URLCONF setting in different branches
I've put site directory created by `django-admin startproject` under version control (Mercurial). Let's say, the site is called `frobnicator`.
Now I want to make some serious refactoring, so I clone the site using command
```
hg clone f... | Simply remove project name from the `ROOT_URLCONF` definition - it is optional. Then you can have project folders with different names. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.