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