Mercurial > hg-stable
view tests/test-bookmarks-rebase @ 10189:e451e599fbcf
patch: support diff data loss detection and upgrade
In worst case, generating diff in upgrade mode can be two times more expensive
than generating it in git mode directly: we may have to regenerate the whole
diff again whenever a git feature is detected. Also, the first diff attempt is
completely buffered instead of being streamed. That said, even without having
profiled it yet, I am convinced we can fast-path the upgrade mode if necessary
were it to be used in regular diff commands, and not only in mq where avoiding
data loss is worth the price.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 20:54:05 +0100 |
parents | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "rebase=" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/' } echo % initialize repository hg init echo 'a' > a hg ci -A -m "0" echo 'b' > b hg ci -A -m "1" hg up 0 echo 'c' > c hg ci -A -m "2" echo 'd' > d hg ci -A -m "3" hg bookmark -r 1 one hg bookmark -r 3 two echo % bookmark list hg bookmark echo % rebase hg rebase -s two -d one 2>&1 | cleanoutput hg log