Show More
@@ -30,7 +30,7 b' createrepo () {' | |||||
30 | addcommit "r2" 7 |
|
30 | addcommit "r2" 7 | |
31 | } |
|
31 | } | |
32 |
|
32 | |||
33 |
createrepo > /dev/null 2 |
|
33 | createrepo > /dev/null 2>&1 | |
34 | echo "% These fail" |
|
34 | echo "% These fail" | |
35 | echo |
|
35 | echo | |
36 | echo "% Use continue and abort" |
|
36 | echo "% Use continue and abort" | |
@@ -64,40 +64,40 b' echo "% Rebase with no arguments (from 3' | |||||
64 | hg update -C 5 |
|
64 | hg update -C 5 | |
65 | hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
65 | hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
66 |
|
66 | |||
67 |
createrepo > /dev/null 2 |
|
67 | createrepo > /dev/null 2>&1 | |
68 | echo |
|
68 | echo | |
69 | echo "% Rebase with base == '.' => same as no arguments (from 3 onto 7)" |
|
69 | echo "% Rebase with base == '.' => same as no arguments (from 3 onto 7)" | |
70 | hg update -C 5 |
|
70 | hg update -C 5 | |
71 | hg rebase --base . 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
71 | hg rebase --base . 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
72 |
|
72 | |||
73 |
createrepo > /dev/null 2 |
|
73 | createrepo > /dev/null 2>&1 | |
74 | echo |
|
74 | echo | |
75 | echo "% Rebase with dest == `hg branch` => same as no arguments (from 3 onto 7)" |
|
75 | echo "% Rebase with dest == `hg branch` => same as no arguments (from 3 onto 7)" | |
76 | hg update -C 5 |
|
76 | hg update -C 5 | |
77 | hg rebase --dest `hg branch` 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
77 | hg rebase --dest `hg branch` 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
78 |
|
78 | |||
79 |
createrepo > /dev/null 2 |
|
79 | createrepo > /dev/null 2>&1 | |
80 | echo |
|
80 | echo | |
81 | echo "% Specify only source (from 4 onto 7)" |
|
81 | echo "% Specify only source (from 4 onto 7)" | |
82 | hg rebase --source 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
82 | hg rebase --source 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
83 |
|
83 | |||
84 |
createrepo > /dev/null 2 |
|
84 | createrepo > /dev/null 2>&1 | |
85 | echo |
|
85 | echo | |
86 | echo "% Specify only dest (from 3 onto 6)" |
|
86 | echo "% Specify only dest (from 3 onto 6)" | |
87 | hg update -C 5 |
|
87 | hg update -C 5 | |
88 | hg rebase --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
88 | hg rebase --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
89 |
|
89 | |||
90 |
createrepo > /dev/null 2 |
|
90 | createrepo > /dev/null 2>&1 | |
91 | echo |
|
91 | echo | |
92 | echo "% Specify only base (from 3 onto 7)" |
|
92 | echo "% Specify only base (from 3 onto 7)" | |
93 | hg rebase --base 5 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
93 | hg rebase --base 5 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
94 |
|
94 | |||
95 |
createrepo > /dev/null 2 |
|
95 | createrepo > /dev/null 2>&1 | |
96 | echo |
|
96 | echo | |
97 | echo "% Specify source and dest (from 4 onto 6)" |
|
97 | echo "% Specify source and dest (from 4 onto 6)" | |
98 | hg rebase --source 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
98 | hg rebase --source 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
99 |
|
99 | |||
100 |
createrepo > /dev/null 2 |
|
100 | createrepo > /dev/null 2>&1 | |
101 | echo |
|
101 | echo | |
102 | echo "% Specify base and dest (from 3 onto 6)" |
|
102 | echo "% Specify base and dest (from 3 onto 6)" | |
103 | hg rebase --base 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
103 | hg rebase --base 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
General Comments 0
You need to be logged in to leave comments.
Login now