Mercurial > hg
view tests/bundles/rebase.sh @ 14663:88cb01c4575e
update: check wc.dirty() before setting overwrite=True
merge.update() was missing a few dirtiness checks from workingcontext,
including subrepo cleanliness checks. Using wc.dirty() instead of
one-off checks for various forms of dirtiness will be significantly
safer.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Fri, 17 Jun 2011 15:21:02 -0500 |
parents | 624e5ce615ec |
children | 5d57b2101ab1 |
line wrap: on
line source
#!/bin/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