comparison tests/test-shelve.t @ 39745:b2ec79559a4b

strip: ignore orphaned internal changesets while computing safe strip roots

Internal changeset can be safely garbage collected, so we can ignore them during
safestrip.

(Another phase for internal changeset that must be kept in the repository might
be introduced later).

39744:52dfa1eb0ad4

  $ echo c >> z
  $ hg shelve
  shelved as default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

#if phasebased
  $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
  rebasing 2:323bfa07f744 "xyz"
  merging x
  warning: orphaned descendants detected, not stripping 323bfa07f744 (?)
#endif

#if stripbased
  $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
  rebasing 2:323bfa07f744 "xyz" (tip)
  merging x
  saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg
#endif
  $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes
  $ hg status
  M z

39745:b2ec79559a4b

  $ echo c >> z
  $ hg shelve
  shelved as default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
  rebasing 2:323bfa07f744 "xyz"( \(tip\))? (re)
  merging x
  saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re)
  $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes
  $ hg status
  M z