Databases
StackOverflow2013
Postsdbo
POMercurial Adding 60+ Merges Randomly
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POMercurial Adding 60+ Merges Randomly
    primarykey
    data
    text
    <p>I just had the strangest thing happen to my mercurial repository, I'm genuinely worried for it's integrity.</p> <h2>Background</h2> <p>I have been committing/pushing intermittently all day no problem until just now where a single commit/push combo yielded a warning that I'd be pushing new branches to the remote location. I whipped open TortoiseHg to see just exactly was going on in my repo tree that would be causing this. (Perhaps i accidentally commited from <code>tip:-1</code>.</p> <p>After opening tortoiseHg I was presented with this:</p> <p><a href="http://img199.imageshack.us/img199/2557/mercurialproblem01.png" rel="nofollow noreferrer">Merge Central http://img199.imageshack.us/img199/2557/mercurialproblem01.png</a></p> <p>Naturally I'm alarmed by this, note the dates these merges are happening from, weeks and months ago. I tracked the lines all the way back to the source to find that they're originating from pretty-much everywhere in my history where merges have happened (and a couple other spots).</p> <p><a href="http://img714.imageshack.us/img714/4575/mercurialproblem02.png" rel="nofollow noreferrer">Origins http://img714.imageshack.us/img714/4575/mercurialproblem02.png</a></p> <h2>Questions</h2> <ul> <li>What <strong>could have</strong> caused this?</li> <li>Is there some hg command/feature that does this intentionally or am I most likely looking at a bug?</li> <li>Is there a simple way to fix this without re-cloning my repo from my remote host?</li> </ul> <p>I am genuinely caught off guard with this one. I most certantly did not perform 60+ merges today, I'm baffled.</p> <h2>Extra Information</h2> <p>TortoiseHG: 2.0.5 (Merc 1.8.4) OS: Windows7</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USAren
    1. USAren
    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. POMercurial Adding 60+ Merges Randomly
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POMercurial Adding 60+ Merges Randomly
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POMercurial Adding 60+ Merges Randomly
      1. This table or related slice is empty.
      1. VTUpMod
    1. COTwo questions: 1) What version of TortoiseHg? 2) Does the command-line (maybe `hg outgoing`) give the same result? You may be better off contacting the TortoiseHg and/or Mercurial mail lists with this one.
      singulars
      1. POMercurial Adding 60+ Merges Randomly
      1. USTim Henigan
    2. COThat graph doesn't say you did them today. It says you did them 6 weeks ago on the most recent.
      singulars
      1. POMercurial Adding 60+ Merges Randomly
      1. USJoel B Fant
    3. CO@Tim Henigan: Updated the Body with some more Info. I was able to undo this nasty with the MQ Extension's "Strip" command. Still would like to know WHY this happened. I dont want it to happen again >_>
      singulars
      1. POMercurial Adding 60+ Merges Randomly
      1. USAren
 

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