Databases
StackOverflow2013
Postsdbo
POConstantly Merging .hgignore in Mercurial
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POConstantly Merging .hgignore in Mercurial
    primarykey
    data
    text
    <p>This is a process question, so there may be more than one right answer. I'll take anything over what I have now, though.</p> <p>My team has recently switched to using Mercurial (from Subversion) and for the most part, we like the new power. However, there are a few things that are reducing productivity. One of those things is managing the <code>.hgignore</code> file.</p> <p>In accordance with the established literature and the advice of "some guys on the internet" :), our team is keeping the <code>.hgignore</code> file up-to-date so that <code>hg addremove</code> always does the right thing. Also, missing files that need to be added is the #1 cause of build failures, so it is important that <code>hg st</code> only returns files that genuinely need action.</p> <p>The problem is that since we always add new ignores to the bottom of the file, it always causes a merge conflict if two people make <code>.hgignore</code> changes. (Most people use the TortoiseHg client, which adds to the end of the file.) The result of this is that about half the time the file is changed, the person changing it has to handle a merge of <code>.hgignore</code>. This feels a lot like having to monkey with the innards of our source control.</p> <p>It's causing developers to not want to add files to the <code>.hgignore</code>, since they know it will take at minimum several additional minutes to deal with. We have a fairly large project with a fairly large team that is undergoing constant changes. New build artifacts are introduced fairly regularly, so the problem doesn't appear to be going away. The <code>.hgignore</code> isn't really stabilizing much, since the project is changing a lot. (Which itself is a different issue, of course.)</p> <p>The 'right' thing to do is 'take both sides' almost always. Technically, two people might have modified the exact same prior line with a text editor, but this is highly unlikely. Unlikely enough that even if the 'take both' approach failed, the consequences are minor.</p> <p>So, I put the question to the community: How can I improve the situation? Is there a process change that would mitigate this? Is there a tool to automatically take both sides? Can I automate the merge somehow? Is there a checkbox that I can check to magically solve the problem :)?</p> <p><strong>Edit 1:</strong> Here's the (obviously redacted) version of my current .hgignore. You can easily observe that there are several different technologies being used. Several portions of the code are in the midst of being transitioned from one tech to another (VB to C# for example). That causes the set of build artifacts to change and the file needs to be updated.</p> <pre><code>syntax: glob *.obj *.tds *.map *.il? */obj/* */lib/* */pch/* Foo/Engine/frezbat/DocFiles.hpp Foo/Engine/personal_defines.h Foo/Engine/revision.cpp Foo/Engine/frobbish/uLinkHlp.hpp Foo/Engine/dll/XMLData/**.xml Foo/Engine/dll/*.syslog Foo/Engine/dll/*.log Foo/Engine/dll/Scripts Foo/Engine/dll/Linked Models Foo/Engine/dll/prv Foo/Engine/dll/pub Foo/Engine/dll/failures.txt Foo/Engine/dll/users.prm Foo/Engine/tools/SrvIface/**.dll Foo/Engine/tools/SrvIface/**.exe */dll/*.ini */dll/*.exe */dll/*.dll */quux_obj/* *.dbg *~ scripts/backupPath.txt *.local *.orig FooDoc/FooDoc/bin/* FooDoc/FooDoc/FooDoc.suo FooDoc/FooDoc/FooDoc.vbproj.user FooDoc/FooDoc_Setup/Release Foo/Engine/dll/FooObjects.pdb Foo/Engine/dll/FooObjects.tlb Foo/Engine/dll/FooObjects.xml Foo/Engine/dll/InitechDebugTimer.txt *.dsk Foo/Engine/dll/Preferences/CustomToolbar.ini Foo/Engine/Engine.~dsk Foo/Engine/dll/ApplicationSettings.fooprefs Foo/Engine/dll/Foo.cgl Foo/Engine/dll/IniShare.mem Foo/Engine/baz_obj/* Foo/Engine/baz_pch/* */dll/*.drc *.~dsk InitechBaz/InitechBaz/bin/Debug/InitechBaz.vshost.exe.manifest InitechBaz/InitechBaz/bin/Debug/InitechBaz.vshost.exe.config InitechBaz/InitechBaz/bin/Debug/InitechBaz.vshost.exe InitechBaz/InitechBaz/bin/Debug/InitechBaz.exe.config scripts/TestComplete/Ottertech_Replay/Log/* scripts/TestComplete/Ottertech_Replay/[* relre:ReSharper* relre:_UpgradeReport_Files glob:*.suo glob:*.pdb *.swp Foo/Engine/FooObjects/FooObjects/bin/x86/ FooDoc/MCtoDAT/MCtoDAT/bin/x86 FooDoc/Deploy Foo/Engine/installers/initech-build/bin/* scripts/TestComplete/Users/* Foo/Engine/dll/MCtoDAT.xml FooDoc/Deploy/* scripts/TestComplete/Ottertech_Replay/Log/* scripts/TestComplete/Ottertech_Replay/[* *.orig Foo/Engine/installers/icon-installers-bin/* Foo/Engine/Quux/Server/*.esp Foo/Engine/Quux/BrapServer/*.esp Foo/Engine/installers/bin/*.exe Foo/Engine/installers/quux/encryptedsql/*.esp Foo/Engine/tools/tempfile.tmp *.pch *.#* *.#?? Foo/Engine/dll/frabbing.lib re:^.*\.\#[0-9][0-9]$ Foo/Engine/Foo/FooObjects/FooObjects/FooObjects.xml FooDoc/MCtoDAT/MCtoDAT/MCtoDAT.xml *.sln.cache FooDoc/TestFooObj/TestFooObj/bin/ *.user Foo/Engine/FooObjects/FooObjects/FooObjects.xml Foo/Engine/FooObjects/FooObjects/FooObjects.xml FooDoc/MCtoDAT/MCtoDAT/MCtoDAT.xml */Debug Installer/*.dll */Debug Installer/*.tlb */Debug Installer/*.xml */Debug Installer/*.msi */Debug Installer/*.exe FooDoc/FooDoc_Setup/Debug/* re:(?i).*\/UpgradeLog.xml *.sln.cache </code></pre>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USalficles
    1. USalficles
    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
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POConstantly Merging .hgignore in Mercurial
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POConstantly Merging .hgignore in Mercurial
      1. This table or related slice is empty.
      1. VTUpMod
    1. COWhat kind of changes are you doing all the time to that file? It's pretty rare that this file has a lot of churn really.
      singulars
      1. POConstantly Merging .hgignore in Mercurial
      1. USLasse Vågsæther Karlsen
    2. COI posted the file so you can see. Part of the reason for the changes is the fact that a number of areas are undergoing tool and tech changes. Theoretically, that should eventually end, but by then, we'll probably be doing something like that in a different area.
      singulars
      1. POConstantly Merging .hgignore in Mercurial
      1. USalficles
    3. COOk, apart from compacting it somewhat, for instance combining all bin, obj and .tmp directories and folders, etc. then I guess you'll have to keep merging. Beyond Compare is a very good merge tool (in my opinion), and it has a "take left, then take right" action. Not automatic, but quite easy to do even so. Might be worth looking at.
      singulars
      1. POConstantly Merging .hgignore in Mercurial
      1. USLasse Vågsæther Karlsen
 

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