Mercurial > hg
annotate tests/test-bookmarks-rebase @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
parents | 8766fee6f225 |
children | b345b1cc124f |
rev | line source |
---|---|
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
1 #!/bin/sh |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
2 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
3 echo "[extensions]" >> $HGRCPATH |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
4 echo "rebase=" >> $HGRCPATH |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
5 echo "bookmarks=" >> $HGRCPATH |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
6 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
7 cleanoutput () { |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
8 sed -e 's/\(Rebase status stored to\).*/\1/' \ |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
9 -e 's/\(Rebase status restored from\).*/\1/' \ |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
10 -e 's/\(saving bundle to \).*/\1/' |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
11 } |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
12 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
13 echo % initialize repository |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
14 hg init |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
15 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
16 echo 'a' > a |
8168
8766fee6f225
tests: removed redundant "-u test" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
17 hg ci -A -m "0" |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
18 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
19 echo 'b' > b |
8168
8766fee6f225
tests: removed redundant "-u test" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
20 hg ci -A -m "1" |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
21 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
22 hg up 0 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
23 echo 'c' > c |
8168
8766fee6f225
tests: removed redundant "-u test" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
24 hg ci -A -m "2" |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
25 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
26 echo 'd' > d |
8168
8766fee6f225
tests: removed redundant "-u test" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
27 hg ci -A -m "3" |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
28 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
29 hg bookmark -r 1 one |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
30 hg bookmark -r 3 two |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
31 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
32 echo % bookmark list |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
33 hg bookmark |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
34 |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
35 echo % rebase |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
36 hg rebase -s two -d one 2>&1 | cleanoutput |
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
37 |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7317
diff
changeset
|
38 hg log |