Show More
@@ -1,34 +1,70 b'' | |||||
1 | #!/bin/sh |
|
1 | $ . $TESTDIR/helpers.sh | |
2 |
|
2 | |||
3 | . $TESTDIR/helpers.sh |
|
3 | $ echo "[extensions]" >> $HGRCPATH | |
|
4 | $ echo "rebase=" >> $HGRCPATH | |||
|
5 | $ echo "bookmarks=" >> $HGRCPATH | |||
4 |
|
6 | |||
5 | echo "[extensions]" >> $HGRCPATH |
|
7 | initialize repository | |
6 | echo "rebase=" >> $HGRCPATH |
|
8 | ||
7 | echo "bookmarks=" >> $HGRCPATH |
|
9 | $ hg init | |
|
10 | ||||
|
11 | $ echo 'a' > a | |||
|
12 | $ hg ci -A -m "0" | |||
|
13 | adding a | |||
8 |
|
14 | |||
9 | echo % initialize repository |
|
15 | $ echo 'b' > b | |
10 | hg init |
|
16 | $ hg ci -A -m "1" | |
|
17 | adding b | |||
11 |
|
18 | |||
12 | echo 'a' > a |
|
19 | $ hg up 0 | |
13 | hg ci -A -m "0" |
|
20 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
21 | $ echo 'c' > c | |||
|
22 | $ hg ci -A -m "2" | |||
|
23 | adding c | |||
|
24 | created new head | |||
14 |
|
25 | |||
15 |
echo ' |
|
26 | $ echo 'd' > d | |
16 |
hg ci -A -m " |
|
27 | $ hg ci -A -m "3" | |
|
28 | adding d | |||
|
29 | ||||
|
30 | $ hg bookmark -r 1 one | |||
|
31 | $ hg bookmark -r 3 two | |||
|
32 | ||||
|
33 | bookmark list | |||
17 |
|
34 | |||
18 | hg up 0 |
|
35 | $ hg bookmark | |
19 | echo 'c' > c |
|
36 | * two 3:2ae46b1d99a7 | |
20 | hg ci -A -m "2" |
|
37 | one 1:925d80f479bb | |
21 |
|
38 | |||
22 | echo 'd' > d |
|
39 | rebase | |
23 | hg ci -A -m "3" |
|
40 | ||
|
41 | $ hg rebase -s two -d one 2>&1 | cleanrebase | |||
|
42 | saved backup bundle to | |||
24 |
|
43 | |||
25 | hg bookmark -r 1 one |
|
44 | $ hg log | |
26 | hg bookmark -r 3 two |
|
45 | changeset: 3:9163974d1cb5 | |
|
46 | tag: one | |||
|
47 | tag: tip | |||
|
48 | tag: two | |||
|
49 | parent: 1:925d80f479bb | |||
|
50 | parent: 2:db815d6d32e6 | |||
|
51 | user: test | |||
|
52 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
53 | summary: 3 | |||
27 |
|
54 | |||
28 | echo % bookmark list |
|
55 | changeset: 2:db815d6d32e6 | |
29 | hg bookmark |
|
56 | parent: 0:f7b1eb17ad24 | |
|
57 | user: test | |||
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
59 | summary: 2 | |||
30 |
|
60 | |||
31 | echo % rebase |
|
61 | changeset: 1:925d80f479bb | |
32 | hg rebase -s two -d one 2>&1 | cleanrebase |
|
62 | user: test | |
|
63 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
64 | summary: 1 | |||
33 |
|
65 | |||
34 | hg log |
|
66 | changeset: 0:f7b1eb17ad24 | |
|
67 | user: test | |||
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
69 | summary: 0 | |||
|
70 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now