sapling/eden/scm/tests/test-rebase-partial.t
Durham Goode 218c83d574 tags: remove tip tag
Summary:
In a future diff we'll be removing tags. The most prevalent tag is
'tip', which shows up in a ton of test output. Let's drop that tag first, so we
can safely update the tests before we drop tags entirely.

Reviewed By: xavierd

Differential Revision: D18995058

fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
2019-12-20 16:14:19 -08:00

113 lines
2.2 KiB
Perl

#chg-compatible
Tests rebasing with part of the rebase set already in the
destination (issue5422)
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
>
> [experimental]
> evolution.createmarkers=True
> evolution.allowunstable=True
> EOF
$ rebasewithdag() {
> N=`$PYTHON -c "print($N+1)"`
> hg init repo$N && cd repo$N
> hg debugdrawdag
> hg rebase "$@" > _rebasetmp
> r=$?
> grep -v 'saved backup bundle' _rebasetmp
> [ $r -eq 0 ] && tglog
> cd ..
> return $r
> }
Rebase two commits, of which one is already in the right place
$ rebasewithdag -r C+D -d B <<EOF
> C
> |
> B D
> |/
> A
> EOF
rebasing b18e25de2cf5 "D" (D)
already rebased 26805aba1e60 "C" (C)
o 4: fe3b4c6498fa 'D' D
|
| o 3: 26805aba1e60 'C' C
|/
o 1: 112478962961 'B' B
|
o 0: 426bada5c675 'A' A
Can collapse commits even if one is already in the right place
$ rebasewithdag --collapse -r C+D -d B <<EOF
> C
> |
> B D
> |/
> A
> EOF
rebasing b18e25de2cf5 "D" (D)
rebasing 26805aba1e60 "C" (C)
o 4: a2493f4ace65 'Collapsed revision
| * D
| * C' C D
o 1: 112478962961 'B' B
|
o 0: 426bada5c675 'A' A
Rebase with "holes". The commits after the hole should end up on the parent of
the hole (B below), not on top of the destination (A).
$ rebasewithdag -r B+D -d A <<EOF
> D
> |
> C
> |
> B
> |
> A
> EOF
already rebased 112478962961 "B" (B)
rebasing f585351a92f8 "D" (D)
o 4: 1e6da8103bc7 'D' D
|
| o 2: 26805aba1e60 'C' C
|/
o 1: 112478962961 'B' B
|
o 0: 426bada5c675 'A' A
Abort doesn't lose the commits that were already in the right place
$ newrepo abort
$ hg debugdrawdag <<EOF
> C
> |
> B D # B/file = B
> |/ # D/file = D
> A
> EOF
$ hg rebase -r C+D -d B
rebasing ef8c0fe0897b "D" (D)
merging file
warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort
rebase aborted
$ tglog
o 3: 79f6d6ab7b14 'C' C
|
| o 2: ef8c0fe0897b 'D' D
| |
o | 1: 594087dbaf71 'B' B
|/
o 0: 426bada5c675 'A' A