Mercurial > hg
view tests/test-parentrevspec @ 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 | 4fe04b183fd8 |
children | 0d4e068e9e52 |
line wrap: on
line source
#!/bin/sh commit() { msg=$1 p1=$2 p2=$3 if [ "$p1" ]; then hg up -qC $p1 fi if [ "$p2" ]; then HGMERGE=true hg merge -q $p2 fi echo >> foo hg commit -d '0 0' -qAm "$msg" foo } hg init repo cd repo echo '[extensions]' > .hg/hgrc echo 'hgext.parentrevspec =' >> .hg/hgrc commit '0: add foo' commit '1: change foo 1' commit '2: change foo 2a' commit '3: change foo 3a' commit '4: change foo 2b' 1 commit '5: merge' 3 4 commit '6: change foo again' hg log --template '#rev#:#node|short# #parents#\n' echo lookup() { for rev in "$@"; do printf "$rev: " hg id -nr $rev done true } tipnode=`hg id -ir tip` echo 'should work with tag/branch/node/rev' for r in tip default $tipnode 6; do lookup "$r^" done echo echo 'some random lookups' lookup "6^^" "6^^^" "6^^^^" "6^^^^^" "6^^^^^^" "6^1" "6^2" "6^^2" "6^1^2" "6^^3" lookup "6~" "6~1" "6~2" "6~3" "6~4" "6~5" "6~42" "6~1^2" "6~1^2~2" echo echo 'with a tag "6^" pointing to rev 1' hg tag -l -r 1 "6^" lookup "6^" "6^1" "6~1" "6^^" echo echo 'with a tag "foo^bar" pointing to rev 2' hg tag -l -r 2 "foo^bar" lookup "foo^bar" "foo^bar^"