Mercurial > hg
view tests/test-issue672.out @ 5909:f45f7390c1c5
strip: calculate list of extra nodes to save and pass it to changegroupsubset
When we remove revision N from the repository, all revisions >= N are
affected: either it's a descendant from N and will also be removed, or
it's not a descendant of N and will be renumbered.
As a consequence, we have to (at least temporarily) remove all filelog
and manifest revisions that have a linkrev >= N, readding some of them
later.
Unfortunately, it's possible to have a revlog with two revisions
r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try
to strip revision linkrev(r1) from the repository, we'll also lose
revision r2 when we truncate this revlog.
We already use changegroupsubset to create a temporary changegroup
containing the revisions that have to be restored, but that function is
unable to detect that we also wanted to save the r2 in the case above.
So we manually calculate these extra nodes and pass it to changegroupsubset.
This should fix issue764.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 19 Jan 2008 18:01:16 -0200 |
parents | 124577de40a7 |
children | 5af5f0f9d724 |
line wrap: on
line source
adding 1 adding 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 checking for directory renames 1: other deleted -> r 1a: remote created -> g removing 1 getting 1a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 searching for copies back to rev 1 unmatched files in local: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames 1a: local moved to 1 -> m merging 1a and 1 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames 1: remote moved to 1a -> m copying 1 to 1a merging 1 and 1a my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d removing 1 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)