Databases
StackOverflow2013
Postsdbo
POBreaking the file connection in Mercurial after bad file split
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POBreaking the file connection in Mercurial after bad file split
    primarykey
    data
    text
    <p><strong>Background:</strong></p> <p>At first there was a file <code>base.c</code>, and that file was in the repository which had only one branch <code>Base</code>. </p> <p><code>Base</code> was branched to make <code>Extended</code>-branch. Then this new branch had several changes made to <code>base.c</code>.</p> <p>If bugs were fixed in file <code>base.c</code> in <code>Base</code>, they would be merged to <code>Extended</code>.</p> <p>It turns out that adding too much stuff to <code>base.c</code> in <code>Extended</code> branch was not a good idea, so file is copied to <code>ext.c</code>. Then most of the <code>Extended</code> additions are removed from <code>base.c</code>, and <code>Base</code> functionality from <code>ext.c</code>. So at this point <code>base.c</code> in <code>Extended</code> is very similar as in <code>Base</code>.</p> <p><strong>Problem:</strong></p> <p>When file was split, Mercurial was informed that <code>ext.c</code> is a copy of <code>base.c</code>, because they shared a common history. Unfortunately this was not a good idea.</p> <p>Now if bugs are fixed on <code>Base</code> branch and merged to <code>Extended</code>, Mercurial thinks that those changes should be applied to both <code>base.c</code> and <code>ext.c</code>, even though the latter is no longer has any similarities to former. This makes the merges very annoying.</p> <p>Is there a way to tell the Mercurial that <code>ext.c</code> should no longer be considered same as <code>base.c</code>? One solution would be to replace <code>ext.c</code> with new file, but then history would not follow.</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. USuser694733
    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. This table or related slice is empty.
    1. VO
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. USRudy Matela
      1. VTFavorite
    1. COInteresting problem. I assume you made the copy with `hg copy`?
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. USicabod
    2. COYes `hg copy` was used.
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. USuser694733
    3. COYou could break the connection if you `hg forget ext.c` and then `hg add` it as a new file... but then you'd lose all history up to this point. However, you could add an _earlier_ version of `ext.c` (maybe even before the rename), and replay (graft) it's history since then.
      singulars
      1. POBreaking the file connection in Mercurial after bad file split
      1. USalexis
 

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