##// END OF EJS Templates
shelve: unshelve using an unfiltered repository...
David Soria Parra -
r20064:99c4b8f7 stable
parent child Browse files
Show More
@@ -610,7 +610,7 b' def unshelve(ui, repo, *shelved, **opts)'
610 # but it doesn't update the inmemory structures, so addchangegroup
610 # but it doesn't update the inmemory structures, so addchangegroup
611 # hooks still fire and try to operate on the missing commits.
611 # hooks still fire and try to operate on the missing commits.
612 # Clean up manually to prevent this.
612 # Clean up manually to prevent this.
613 repo.changelog.strip(oldtiprev, tr)
613 repo.unfiltered().changelog.strip(oldtiprev, tr)
614
614
615 unshelvecleanup(ui, repo, basename, opts)
615 unshelvecleanup(ui, repo, basename, opts)
616 finally:
616 finally:
@@ -520,4 +520,23 b' unshelve should work on an ancestor of t'
520 $ hg status
520 $ hg status
521 A d
521 A d
522
522
523 test bug 4073 we need to enable obsolete markers for it
524
525 $ cat > ../obs.py << EOF
526 > import mercurial.obsolete
527 > mercurial.obsolete._enabled = True
528 > EOF
529 $ echo '[extensions]' >> $HGRCPATH
530 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
531 $ hg shelve
532 shelved as default
533 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
534 $ hg debugobsolete `hg --debug id -i -r 1`
535 $ hg unshelve
536 unshelving change 'default'
537 adding changesets
538 adding manifests
539 adding file changes
540 added 1 changesets with 1 changes to 2 files (+1 heads)
541
523 $ cd ..
542 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now