Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45090:0ecb3b11fcad
rebase: correctly check for empty commit in in-memory mode
The new code has a small overhead in the empty commit case, as a `memctx` object
is always created, but I don’t think it’s justified here to duplicate code
to optimize a relatively unlikely code path.
Differential Revision: https://phab.mercurial-scm.org/D8732
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 11 Jul 2020 03:10:23 +0200 |
parents | ab33782deb84 |
children | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
45089:d085fcb11c56 | 45090:0ecb3b11fcad |
---|---|
947 | |/ | 947 | |/ |
948 o / 1: 6f252845ea45 'a' | 948 o / 1: 6f252845ea45 'a' |
949 |/ | 949 |/ |
950 o 0: d20a80d4def3 'base' | 950 o 0: d20a80d4def3 'base' |
951 | 951 |
952 FIXME: It's broken for inmemory merges. | |
953 $ hg rebase -s 2 -d 3 | 952 $ hg rebase -s 2 -d 3 |
954 rebasing 2:0194f1db184a "b" | 953 rebasing 2:0194f1db184a "b" |
955 note: not rebasing 2:0194f1db184a "b", its destination already has all its changes | 954 note: not rebasing 2:0194f1db184a "b", its destination already has all its changes |
956 rebasing 4:59c8292117b1 "merge" (tip) | 955 rebasing 4:59c8292117b1 "merge" (tip) |
957 note: not rebasing 4:59c8292117b1 "merge" (tip), its destination already has all its changes (true !) | |
958 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg | 956 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg |
959 #if false | |
960 $ hg tglog | 957 $ hg tglog |
961 o 3: 506e2454484b 'merge' | 958 o 3: 506e2454484b 'merge' |
962 |\ | 959 |\ |
963 | o 2: 531f80391e4a 'c' | 960 | o 2: 531f80391e4a 'c' |
964 | | | 961 | | |
965 o | 1: 6f252845ea45 'a' | 962 o | 1: 6f252845ea45 'a' |
966 |/ | 963 |/ |
967 o 0: d20a80d4def3 'base' | 964 o 0: d20a80d4def3 'base' |
968 | 965 |
969 #endif |