comparison tests/test-rebase-inmemory.t @ 47787:48da5c325750 stable

rewriteutil: fix crash when a rewritten message references f{6,64}

Without this, the rewriteutil logic thinks it's found a reference to the wdir
pseudo-revision, and then tries to look it up and rewrite it. Stop it from
doing that.

Amusingly, I had trouble working with this changeset when I didn't
describe the defect above using a regular expression, because it would
trigger the bug in my installed version of hg.

Differential Revision: https://phab.mercurial-scm.org/D11232

47786:324c8a299324

  $ echo update_hash_refs > update_hash_refs
  $ hg add update_hash_refs
  $ hg ci -m 'this will change hash'
  created new head
  $ echo changed >> update_hash_refs
  $ hg ci -m "this starts as the child of `hg log -r . -T'{node|short}'` but not 506e2454484b"
  $ hg tglog
  @  5: becd28036887 'this starts as the child of 98789aa60148 but not 506e2454484b'
  |
  o  4: 98789aa60148 'this will change hash'
  |
  | o    3: 506e2454484b 'merge'
  | |\

  |/
  o  0: d20a80d4def3 'base'
  
  $ hg rebase -r '.^::' -d 3
  rebasing 4:98789aa60148 "this will change hash"
  rebasing 5:becd28036887 tip "this starts as the child of 98789aa60148 but not 506e2454484b"
  saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/98789aa60148-72ec40bd-rebase.hg
  $ hg tglog
  @  5: a445b8426f4b 'this starts as the child of c16c25696fe7 but not 506e2454484b'
  |
  o  4: c16c25696fe7 'this will change hash'
  |
  o    3: 506e2454484b 'merge'
  |\

47787:48da5c325750

  $ echo update_hash_refs > update_hash_refs
  $ hg add update_hash_refs
  $ hg ci -m 'this will change hash'
  created new head
  $ echo changed >> update_hash_refs
  $ hg ci -m "this starts as the child of `hg log -r . -T'{node|short}'` but not 506e2454484b. Also, ffffffffffffffff"
  $ hg tglog
  @  5: a8b42cbbde83 'this starts as the child of 98789aa60148 but not 506e2454484b. Also, ffffffffffffffff'
  |
  o  4: 98789aa60148 'this will change hash'
  |
  | o    3: 506e2454484b 'merge'
  | |\

  |/
  o  0: d20a80d4def3 'base'
  
  $ hg rebase -r '.^::' -d 3
  rebasing 4:98789aa60148 "this will change hash"
  rebasing 5:a8b42cbbde83 tip "this starts as the child of 98789aa60148 but not 506e2454484b. Also, ffffffffffffffff"
  saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/98789aa60148-da3f4c2c-rebase.hg
  $ hg tglog
  @  5: 0fd2912e6cc1 'this starts as the child of c16c25696fe7 but not 506e2454484b. Also, ffffffffffffffff'
  |
  o  4: c16c25696fe7 'this will change hash'
  |
  o    3: 506e2454484b 'merge'
  |\