Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 42288:cdcebc897529
overlaycontext: allow calling copydata() on clean context
We should just report no copy if the context is clean.
Differential Revision: https://phab.mercurial-scm.org/D6358
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 10 May 2019 11:03:54 -0700 |
parents | 5265c7d47213 |
children | 70845eb656a9 |
comparison
equal
deleted
inserted
replaced
42287:5265c7d47213 | 42288:cdcebc897529 |
---|---|
772 $ echo a2 > a | 772 $ echo a2 > a |
773 $ hg ci -m 'modify a' | 773 $ hg ci -m 'modify a' |
774 $ hg co -q 0 | 774 $ hg co -q 0 |
775 $ hg mv a b | 775 $ hg mv a b |
776 $ hg ci -qm 'rename a to b' | 776 $ hg ci -qm 'rename a to b' |
777 $ hg rebase -d 1 2>&1 | grep '** ProgrammingError' | 777 $ hg rebase -d 1 |
778 ** ProgrammingError: copydata() called on clean context | 778 rebasing 2:b977edf6f839 "rename a to b" (tip) |
779 merging a and b to b | |
780 saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg | |
781 $ hg st --copies --change . | |
782 A b | |
783 a | |
784 R a | |
779 $ cd .. | 785 $ cd .. |
780 | 786 |
781 Test rebasing when the file we are merging in destination is empty | 787 Test rebasing when the file we are merging in destination is empty |
782 | 788 |
783 $ hg init test | 789 $ hg init test |