Databases
StackOverflow2013
Postsdbo
POHow can I find all the merges that had conflicts in a Mercurial repository?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow can I find all the merges that had conflicts in a Mercurial repository?
    primarykey
    data
    text
    <p>I am working on a research to study merges in open source projects.</p> <p>I recently asked <a href="https://stackoverflow.com/questions/15637103/how-can-i-find-all-the-commits-that-have-multiple-parents-in-a-mercurial-reposit">How can I find all the commits that have multiple parents in a Mercurial repository?</a>, and got a very good answer.</p> <p>Now I need to narrow my query to only find the commits that had conflicts.</p> <p>With conflicts I mean that the same file was modified in the two contributing commits.</p> <p>Also, it would be very useful if I can find a mercurial or bash (grep, awk?) command that gives me only those commits in which the same line was modified by the two contributors.</p> <p>The idea is to find commits that cannot be auto-resolved.</p> <p>So, How can I find all the merges that had conflicts in a Mercurial repository?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USmacrobug
    plurals
    1. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    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. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USmacrobug
      1. VTFavorite
    2. VO
      singulars
      1. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USmacrobug
      1. VTBountyStart
    3. VO
      singulars
      1. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USRamón García-Pérez
      1. VTFavorite
    1. COIn case anyone is interested, I asked the same question for Git too: http://stackoverflow.com/questions/15707769/how-can-i-find-all-the-merges-that-had-conflicts-in-a-git-repository
      singulars
      1. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USmacrobug
    2. COJust post some sample input and expected output along with an explanation of the textual transformation without reference to your domain-specific terminology (e.g. "merges", "commits", "parents", "conflicts", "mercurial" probably either don't mean anything or could mean many things to many of the people reading this). It's more likely you'll get a good answer if you can do that than if you expect everyone else to go read a bunch of old posts to try to figure out what your question is about.
      singulars
      1. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USEd Morton
    3. COFair enough Ed. "Commits" are what in other version control systems are called revisions or changesets, which are atomic units of related changes. The "parent" of a commit is another commit that immediately precedes it. With "merges" I mean commits that have multiple parents. A "conflict" happens when two parents modify the same line of code. "Mercurial" is a distributed version control system. Sample input: any considerable sized open source mercurial repository (I have plenty of these). Sample output: a list of commit IDs (e.g. 15691597c1bd120b0b393a9577c183121ea72c2e)
      singulars
      1. POHow can I find all the merges that had conflicts in a Mercurial repository?
      1. USmacrobug
 

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