author | Matt Mackall <mpm@selenic.com> |
Mon, 20 Sep 2010 16:14:05 -0500 | |
changeset 12347 | 6277a9469dff |
parent 11907 | 863567a1364f |
child 12375 | 02990e22150b |
permissions | -rw-r--r-- |
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
1 |
$ echo "[extensions]" >> $HGRCPATH |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
2 |
$ echo "rebase=" >> $HGRCPATH |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
3 |
$ echo "bookmarks=" >> $HGRCPATH |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
8168
diff
changeset
|
4 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
5 |
initialize repository |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
6 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
7 |
$ hg init |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
8 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
9 |
$ echo 'a' > a |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
10 |
$ hg ci -A -m "0" |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
11 |
adding a |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
12 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
13 |
$ echo 'b' > b |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
14 |
$ hg ci -A -m "1" |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
15 |
adding b |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
16 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
17 |
$ hg up 0 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
18 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
19 |
$ echo 'c' > c |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
20 |
$ hg ci -A -m "2" |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
21 |
adding c |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
22 |
created new head |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
23 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
24 |
$ echo 'd' > d |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
25 |
$ hg ci -A -m "3" |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
26 |
adding d |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
27 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
28 |
$ hg bookmark -r 1 one |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
29 |
$ hg bookmark -r 3 two |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
30 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
31 |
bookmark list |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
32 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
33 |
$ hg bookmark |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
34 |
* two 3:2ae46b1d99a7 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
35 |
one 1:925d80f479bb |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
36 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
37 |
rebase |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
38 |
|
11907
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11863
diff
changeset
|
39 |
$ hg rebase -s two -d one |
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11863
diff
changeset
|
40 |
saved backup bundle to .* |
7317
98408cb74137
bookmarks: Test if rebase works with bookmarks
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff
changeset
|
41 |
|
11863
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
42 |
$ hg log |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
43 |
changeset: 3:9163974d1cb5 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
44 |
tag: one |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
45 |
tag: tip |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
46 |
tag: two |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
47 |
parent: 1:925d80f479bb |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
48 |
parent: 2:db815d6d32e6 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
49 |
user: test |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
50 |
date: Thu Jan 01 00:00:00 1970 +0000 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
51 |
summary: 3 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
52 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
53 |
changeset: 2:db815d6d32e6 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
54 |
parent: 0:f7b1eb17ad24 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
55 |
user: test |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
56 |
date: Thu Jan 01 00:00:00 1970 +0000 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
57 |
summary: 2 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
58 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
59 |
changeset: 1:925d80f479bb |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
60 |
user: test |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
61 |
date: Thu Jan 01 00:00:00 1970 +0000 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
62 |
summary: 1 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
63 |
|
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
64 |
changeset: 0:f7b1eb17ad24 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
65 |
user: test |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
66 |
date: Thu Jan 01 00:00:00 1970 +0000 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
67 |
summary: 0 |
86ec95b1d37b
tests: unify test-bookmarks-rebase
Martin Geisler <mg@lazybytes.net>
parents:
11208
diff
changeset
|
68 |