Show More
@@ -0,0 +1,38 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | echo "[extensions]" >> $HGRCPATH | |||
|
4 | echo "rebase=" >> $HGRCPATH | |||
|
5 | echo "bookmarks=" >> $HGRCPATH | |||
|
6 | ||||
|
7 | cleanoutput () { | |||
|
8 | sed -e 's/\(Rebase status stored to\).*/\1/' \ | |||
|
9 | -e 's/\(Rebase status restored from\).*/\1/' \ | |||
|
10 | -e 's/\(saving bundle to \).*/\1/' | |||
|
11 | } | |||
|
12 | ||||
|
13 | echo % initialize repository | |||
|
14 | hg init | |||
|
15 | ||||
|
16 | echo 'a' > a | |||
|
17 | hg ci -A -d '0 0' -u test -m "0" | |||
|
18 | ||||
|
19 | echo 'b' > b | |||
|
20 | hg ci -A -d '0 0' -u test -m "1" | |||
|
21 | ||||
|
22 | hg up 0 | |||
|
23 | echo 'c' > c | |||
|
24 | hg ci -A -d '0 0' -u test -m "2" | |||
|
25 | ||||
|
26 | echo 'd' > d | |||
|
27 | hg ci -A -d '0 0' -u test -m "3" | |||
|
28 | ||||
|
29 | hg bookmark -r 1 one | |||
|
30 | hg bookmark -r 3 two | |||
|
31 | ||||
|
32 | echo % bookmark list | |||
|
33 | hg bookmark | |||
|
34 | ||||
|
35 | echo % rebase | |||
|
36 | hg rebase -s two -d one 2>&1 | cleanoutput | |||
|
37 | ||||
|
38 | hg log No newline at end of file |
@@ -0,0 +1,42 b'' | |||||
|
1 | % initialize repository | |||
|
2 | adding a | |||
|
3 | adding b | |||
|
4 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
5 | adding c | |||
|
6 | created new head | |||
|
7 | adding d | |||
|
8 | % bookmark list | |||
|
9 | * two 3:2ae46b1d99a7 | |||
|
10 | one 1:925d80f479bb | |||
|
11 | % rebase | |||
|
12 | saving bundle to | |||
|
13 | adding branch | |||
|
14 | adding changesets | |||
|
15 | adding manifests | |||
|
16 | adding file changes | |||
|
17 | added 1 changesets with 1 changes to 1 files (-1 heads) | |||
|
18 | rebase completed | |||
|
19 | changeset: 3:9163974d1cb5 | |||
|
20 | tag: tip | |||
|
21 | parent: 1:925d80f479bb | |||
|
22 | parent: 2:db815d6d32e6 | |||
|
23 | user: test | |||
|
24 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
25 | summary: 3 | |||
|
26 | ||||
|
27 | changeset: 2:db815d6d32e6 | |||
|
28 | parent: 0:f7b1eb17ad24 | |||
|
29 | user: test | |||
|
30 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
31 | summary: 2 | |||
|
32 | ||||
|
33 | changeset: 1:925d80f479bb | |||
|
34 | user: test | |||
|
35 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
36 | summary: 1 | |||
|
37 | ||||
|
38 | changeset: 0:f7b1eb17ad24 | |||
|
39 | user: test | |||
|
40 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
41 | summary: 0 | |||
|
42 |
General Comments 0
You need to be logged in to leave comments.
Login now