Show More
@@ -95,8 +95,8 b'' | |||||
95 | histedit: moving bookmarks will-move-backwards |
|
95 | histedit: moving bookmarks will-move-backwards | |
96 | histedit: e860deea161a to ae467701c500 |
|
96 | histedit: e860deea161a to ae467701c500 | |
97 | histedit: moving bookmarks four |
|
97 | histedit: moving bookmarks four | |
98 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg |
|
98 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) | |
99 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg |
|
99 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) | |
100 | $ hg log --graph |
|
100 | $ hg log --graph | |
101 | @ changeset: 3:0efacef7cb48 |
|
101 | @ changeset: 3:0efacef7cb48 | |
102 | | bookmark: five |
|
102 | | bookmark: five | |
@@ -152,7 +152,7 b'' | |||||
152 | histedit: 0efacef7cb48 to 7c044e3e33a9 |
|
152 | histedit: 0efacef7cb48 to 7c044e3e33a9 | |
153 | histedit: ae467701c500 to 1be9c35b4cb2 |
|
153 | histedit: ae467701c500 to 1be9c35b4cb2 | |
154 | histedit: moving bookmarks four, three |
|
154 | histedit: moving bookmarks four, three | |
155 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg |
|
155 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) | |
156 |
|
156 | |||
157 | We expect 'five' to stay at tip, since the tipmost bookmark is most |
|
157 | We expect 'five' to stay at tip, since the tipmost bookmark is most | |
158 | likely the useful signal. |
|
158 | likely the useful signal. |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > pick 177f92b77385 c |
|
11 | > pick 177f92b77385 c | |
12 | > pick e860deea161a e |
|
12 | > pick e860deea161a e |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > drop 177f92b77385 c |
|
11 | > drop 177f92b77385 c | |
12 | > pick e860deea161a e |
|
12 | > pick e860deea161a e |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > pick 177f92b77385 c |
|
11 | > pick 177f92b77385 c | |
12 | > pick 055a42cdd887 d |
|
12 | > pick 055a42cdd887 d | |
@@ -70,7 +70,7 b' commit, then edit the revision' | |||||
70 | $ hg ci -m 'wat' |
|
70 | $ hg ci -m 'wat' | |
71 | created new head |
|
71 | created new head | |
72 | $ echo a > e |
|
72 | $ echo a > e | |
73 |
$ HGEDITOR='echo |
|
73 | $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle | |
74 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
75 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 |
|
76 |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > pick 177f92b77385 c |
|
11 | > pick 177f92b77385 c | |
12 | > pick 055a42cdd887 d |
|
12 | > pick 055a42cdd887 d |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > pick e860deea161a e |
|
11 | > pick e860deea161a e | |
12 | > pick 652413bf663e f |
|
12 | > pick 652413bf663e f |
@@ -6,7 +6,7 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 |
$ EDITED= |
|
9 | $ EDITED="$TESTTMP/editedhistory" | |
10 | $ cat > $EDITED <<EOF |
|
10 | $ cat > $EDITED <<EOF | |
11 | > pick 177f92b77385 c |
|
11 | > pick 177f92b77385 c | |
12 | > pick 055a42cdd887 d |
|
12 | > pick 055a42cdd887 d |
General Comments 0
You need to be logged in to leave comments.
Login now