view tests/bundles/rebase.sh @ 38092:f3776f70985e

patch: add debug message to show external patch tool invocation Differential Revision: https://phab.mercurial-scm.org/D3619
author Augie Fackler <augie@google.com>
date Sat, 19 May 2018 15:14:56 -0400
parents 5d57b2101ab1
children
line wrap: on
line source

#!/usr/bin/env bash
hg init rebase
cd rebase

#  @  7: 'H'
#  |
#  | o  6: 'G'
#  |/|
#  o |  5: 'F'
#  | |
#  | o  4: 'E'
#  |/
#  | o  3: 'D'
#  | |
#  | o  2: 'C'
#  | |
#  | o  1: 'B'
#  |/
#  o  0: 'A'

echo A > A
hg ci -Am A
echo B > B
hg ci -Am B
echo C > C
hg ci -Am C
echo D > D
hg ci -Am D
hg up -q -C 0
echo E > E
hg ci -Am E
hg up -q -C 0
echo F > F
hg ci -Am F
hg merge -r 4
hg ci -m G
hg up -q -C 5
echo H > H
hg ci -Am H

hg bundle -a ../rebase.hg

cd ..
rm -Rf rebase