Databases
StackOverflow2013
Postsdbo
POIs it possible to use the Mercurial Fetch extension with the TortoiseHg merge dialog?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POIs it possible to use the Mercurial Fetch extension with the TortoiseHg merge dialog?
    primarykey
    data
    text
    <p>I'm trying to implement Mercurial in the company where I work. Previously we used ClearCase, but for various reasons we decided to upgrade to Mercurial. The development team is very accustomed to the ClearCase workflow, especially the visual tools. Therefore, for our implementation of Mercurial, we will be using TortoiseHg.</p> <p>A Mercurial extension that caught my attention is the Fetch extension, which allows to do a "hg pull -u" followed by "hg merge" and "hg commit", if necessary. The extension basically does what we want and integrates perfectly with TortoiseHg configuring it to run automatically "Post Pull."</p> <p>The only problem is that the Fetch extension does not allow to compile and test the merge before running the commit. However, using the TortoiseHg merge dialog with "hgtk merge -r tip" there is a visual way to run the merge command, but with the advantage of allowing me to compile and run the tests. If all went well I press the Commit button, but if something went wrong just press Undo and everything is back as before.</p> <p>TortoiseHg Merge Dialog: <a href="http://www.freeimagehosting.net/uploads/a2f43fe5ff.png" rel="nofollow noreferrer">http://www.freeimagehosting.net/uploads/a2f43fe5ff.png</a></p> <p>So, my question is: <strong>Is it possible to use the Mercurial Fetch extension with the TortoiseHg merge dialog?</strong></p> <p>If it's not possible, how would you recommend implementing this workflow? Is there a way to assign an Alias to this secuence:</p> <pre><code>hg pull -u * if merge is needed * hgtk merge -r tip </code></pre> <p>I am not sure if you could have an "if" in an alias, but I think not.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USmacrobug
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POIs it possible to use the Mercurial Fetch extension with the TortoiseHg merge dialog?
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload