equal
deleted
inserted
replaced
4 > [extensions] |
4 > [extensions] |
5 > graphlog= |
5 > graphlog= |
6 > histedit= |
6 > histedit= |
7 > EOF |
7 > EOF |
8 |
8 |
9 $ EDITED="$TESTTMP/editedhistory" |
|
10 $ cat > $EDITED <<EOF |
|
11 > pick 177f92b77385 c |
|
12 > pick 055a42cdd887 d |
|
13 > pick bfa474341cc9 does not commute with e |
|
14 > pick e860deea161a e |
|
15 > pick 652413bf663e f |
|
16 > EOF |
|
17 $ initrepo () |
9 $ initrepo () |
18 > { |
10 > { |
19 > hg init r |
11 > hg init r |
20 > cd r |
12 > cd r |
21 > for x in a b c d e f ; do |
13 > for x in a b c d e f ; do |
69 date: Thu Jan 01 00:00:00 1970 +0000 |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
70 summary: a |
62 summary: a |
71 |
63 |
72 |
64 |
73 edit the history |
65 edit the history |
74 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
66 $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle |
|
67 > pick 177f92b77385 c |
|
68 > pick 055a42cdd887 d |
|
69 > pick bfa474341cc9 does not commute with e |
|
70 > pick e860deea161a e |
|
71 > pick 652413bf663e f |
|
72 > EOF |
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
73 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
76 remote changed e which local deleted |
74 remote changed e which local deleted |
77 use (c)hanged version or leave (d)eleted? c |
75 use (c)hanged version or leave (d)eleted? c |
78 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 merging e |
77 merging e |