Mercurial > hg
view tests/test-rebase-backup.t @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | 6acbe86c6490 |
children | dc5e5577af39 |
line wrap: on
line source
$ cat << EOF >> $HGRCPATH > [extensions] > rebase= > EOF ================================== Test backup-bundle config option | ================================== Test with Pre-obsmarker rebase: 1) When config option is not set: $ hg init repo1 $ cd repo1 $ echo a>a $ hg ci -qAma $ echo b>b $ hg ci -qAmb $ echo c>c $ hg ci -qAmc $ hg up 0 -q $ echo d>d $ hg ci -qAmd $ echo e>e $ hg ci -qAme $ hg log -GT "{rev}: {firstline(desc)}\n" @ 4: e | o 3: d | | o 2: c | | | o 1: b |/ o 0: a $ hg rebase -s 1 -d . rebasing 1:d2ae7f538514 "b" rebasing 2:177f92b77385 "c" saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/d2ae7f538514-c7ed7a78-rebase.hg $ hg log -GT "{rev}: {firstline(desc)}\n" o 4: c | o 3: b | @ 2: e | o 1: d | o 0: a 2) When config option is set: $ cat << EOF >> $HGRCPATH > [rewrite] > backup-bundle = False > EOF $ echo f>f $ hg ci -Aqmf $ echo g>g $ hg ci -Aqmg $ hg log -GT "{rev}: {firstline(desc)}\n" @ 6: g | o 5: f | | o 4: c | | | o 3: b |/ o 2: e | o 1: d | o 0: a $ hg rebase -s 3 -d . rebasing 3:05bff2a95b12 "b" rebasing 4:1762bde4404d "c" $ hg log -GT "{rev}: {firstline(desc)}\n" o 6: c | o 5: b | @ 4: g | o 3: f | o 2: e | o 1: d | o 0: a Test when rebased revisions are stripped during abort: ====================================================== $ echo conflict > c $ hg ci -Am "conflict with c" adding c created new head $ hg log -GT "{rev}: {firstline(desc)}\n" @ 7: conflict with c | | o 6: c | | | o 5: b |/ o 4: g | o 3: f | o 2: e | o 1: d | o 0: a When backup-bundle = True: $ cat << EOF >> $HGRCPATH > [rewrite] > backup-bundle = True > EOF $ hg rebase -s 5 -d . rebasing 5:1f8148a544ee "b" rebasing 6:f8bc7d28e573 "c" merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg rebase --abort saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg rebase aborted When backup-bundle = False: $ cat << EOF >> $HGRCPATH > [rewrite] > backup-bundle = False > EOF $ hg rebase -s 5 -d . rebasing 5:1f8148a544ee "b" rebasing 6:f8bc7d28e573 "c" merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg rebase --abort rebase aborted $ cd ..