Databases
StackOverflow2013
Postsdbo
POApply mercurial bundle file on different changeset
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POApply mercurial bundle file on different changeset
    primarykey
    data
    text
    <p><strong>TLDR</strong>: I have an HG bundle with parent X, but revision X does not exist in my repo. However, I am <strong>sure</strong> that the files of revision Y are identical to revision X. How do I apply the bundle?</p> <p><strong>Background:</strong></p> <p>I use <code>hgsubversion</code> to interact with an SVN repo.</p> <p>There were some changes I did not want to commit. <code>hgsubversion</code> does not support partial pushes.</p> <p>I used to workaround by manually creating temporary exports/patch files, or manually restoring .orig files (result of <code>hg revert</code>).</p> <p>In this case I committed the changes I did not want to push, then used <code>hg strip</code>, then pushed, then tried to use <code>hg unbundle .hg/strip-backup/file</code>.</p> <p><strong>Problem</strong>: <code>hgsubversion</code> replaces the original changeset with a new one it imports from SVN after it's committed it. Result: the changeset ID changes. This is a problem because now <code>hg unbundle</code> no longer works, as it relies on the parent changeset being there (but it's been stripped).</p> <p>Ironically, <code>hgsubversion</code> itself uses <code>strip</code> and thus has a backup file I can use to strip the new rev, add the stripped old revision, then apply the bundle with my revisions, export the patch, strip both, and restore the SVN revision. But this sounds... extremely painful and stupid. Is there nothing better I can do?</p> <p>(<code>hg transplant</code> doesn't seem to like the bundle without having the parent in the repo, either)</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USGijs
    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
    1. VO
      singulars
      1. POApply mercurial bundle file on different changeset
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POApply mercurial bundle file on different changeset
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POApply mercurial bundle file on different changeset
      1. USprayagupd
      1. VTFavorite
    1. CODo you still have the changesets in question, probably in .hg/strip-backup? If so, it’s easy using MQ. If not, things could become pretty nasty.
      singulars
      1. POApply mercurial bundle file on different changeset
      1. USRingding
    2. CODo you realise that if you update to a specific version, hgsubversion will only push to that revision? e.g. you can do partial commits.
      singulars
      1. POApply mercurial bundle file on different changeset
      1. USStephen
 

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