##// END OF EJS Templates
test-histedit-outgoing.t: remove unused section
Mads Kiilerich -
r17284:f3a7f05f stable
parent child Browse files
Show More
@@ -1,91 +1,84
1 1 $ cat >> $HGRCPATH <<EOF
2 2 > [extensions]
3 3 > graphlog=
4 4 > histedit=
5 5 > EOF
6 6
7 $ EDITED="$TESTTMP/editedhistory"
8 $ cat > $EDITED <<EOF
9 > pick 177f92b77385 c
10 > pick e860deea161a e
11 > pick 652413bf663e f
12 > pick 055a42cdd887 d
13 > EOF
14 7 $ initrepos ()
15 8 > {
16 9 > hg init r
17 10 > cd r
18 11 > for x in a b c ; do
19 12 > echo $x > $x
20 13 > hg add $x
21 14 > hg ci -m $x
22 15 > done
23 16 > cd ..
24 17 > hg clone r r2 | grep -v updating
25 18 > cd r2
26 19 > for x in d e f ; do
27 20 > echo $x > $x
28 21 > hg add $x
29 22 > hg ci -m $x
30 23 > done
31 24 > cd ..
32 25 > hg init r3
33 26 > cd r3
34 27 > for x in g h i ; do
35 28 > echo $x > $x
36 29 > hg add $x
37 30 > hg ci -m $x
38 31 > done
39 32 > cd ..
40 33 > }
41 34
42 35 $ initrepos
43 36 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 37
45 38 show the edit commands offered by outgoing
46 39 $ cd r2
47 40 $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching
48 41 pick 055a42cdd887 3 d
49 42 pick e860deea161a 4 e
50 43 pick 652413bf663e 5 f
51 44
52 45 # Edit history between 055a42cdd887 and 652413bf663e
53 46 #
54 47 # Commands:
55 48 # p, pick = use commit
56 49 # e, edit = use commit, but stop for amending
57 50 # f, fold = use commit, but fold into previous commit (combines N and N-1)
58 51 # d, drop = remove commit from history
59 52 # m, mess = edit message without changing commit content
60 53 #
61 54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
62 55 $ cd ..
63 56
64 57 show the error from unrelated repos
65 58 $ cd r3
66 59 $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching
67 60 abort: repository is unrelated
68 61 [1]
69 62 $ cd ..
70 63
71 64 show the error from unrelated repos
72 65 $ cd r3
73 66 $ HGEDITOR=cat hg histedit --force --outgoing ../r
74 67 comparing with ../r
75 68 searching for changes
76 69 warning: repository is unrelated
77 70 pick 2a4042b45417 0 g
78 71 pick 68c46b4927ce 1 h
79 72 pick 51281e65ba79 2 i
80 73
81 74 # Edit history between 2a4042b45417 and 51281e65ba79
82 75 #
83 76 # Commands:
84 77 # p, pick = use commit
85 78 # e, edit = use commit, but stop for amending
86 79 # f, fold = use commit, but fold into previous commit (combines N and N-1)
87 80 # d, drop = remove commit from history
88 81 # m, mess = edit message without changing commit content
89 82 #
90 83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 84 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now