##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-histedit-edit: improve coverage of histedit code
Augie Fackler -
r17067:81d681f8 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -34,7 +34,8 b' hg log --graph'
34 34 echo % edit the history
35 35 HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
36 36
37 echo % edit the revision
37 echo % commit, then edit the revision
38 hg ci -m 'wat'
38 39 echo a > e
39 40 HGEDITOR='echo "foobaz" > ' hg histedit --continue 2>&1 | fixbundle
40 41
@@ -44,7 +45,7 b" echo '% contents of e:'"
44 45 hg cat e
45 46
46 47 cat > $EDITED <<EOF
47 edit c38516e9ed62 f
48 edit bf757c081cd0 f
48 49 EOF
49 50 HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
50 51 hg status
@@ -67,7 +68,7 b' hg log --limit 1'
67 68
68 69 echo % modify the message
69 70 cat > $EDITED <<EOF
70 mess c38516e9ed62 f
71 mess bf757c081cd0 f
71 72 EOF
72 73 HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
73 74 hg status
Show file before | Show file after | Hide comments
@@ -34,20 +34,26 b' o changeset: 0:cb9a9f314b8b'
34 34 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35 35 abort: Make changes as needed, you may commit or record as needed now.
36 36 When you are finished, run hg histedit --continue to resume.
37 % edit the revision
37 % commit, then edit the revision
38 created new head
38 39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
39 40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 @ changeset: 5:c38516e9ed62
41 @ changeset: 6:bf757c081cd0
41 42 | tag: tip
42 43 | user: test
43 44 | date: Thu Jan 01 00:00:00 1970 +0000
44 45 | summary: f
45 46 |
46 o changeset: 4:1da62d13177d
47 o changeset: 5:d6b15fed32d4
47 48 | user: test
48 49 | date: Thu Jan 01 00:00:00 1970 +0000
49 50 | summary: foobaz
50 51 |
52 o changeset: 4:1a60820cd1f6
53 | user: test
54 | date: Thu Jan 01 00:00:00 1970 +0000
55 | summary: wat
56 |
51 57 o changeset: 3:055a42cdd887
52 58 | user: test
53 59 | date: Thu Jan 01 00:00:00 1970 +0000
@@ -76,7 +82,7 b' When you are finished, run hg histedit -'
76 82 A f
77 83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 84 % log after edit
79 changeset: 5:c38516e9ed62
85 changeset: 6:bf757c081cd0
80 86 tag: tip
81 87 user: test
82 88 date: Thu Jan 01 00:00:00 1970 +0000
@@ -85,7 +91,7 b' summary: f'
85 91 % say we'll change the message, but don't.
86 92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
87 93 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
88 changeset: 5:c38516e9ed62
94 changeset: 6:bf757c081cd0
89 95 tag: tip
90 96 user: test
91 97 date: Thu Jan 01 00:00:00 1970 +0000
@@ -94,11 +100,11 b' summary: f'
94 100 % modify the message
95 101 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
96 102 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
97 changeset: 5:4d6a10bcf3e3
103 changeset: 6:0b16746f8e89
98 104 tag: tip
99 105 user: test
100 106 date: Thu Jan 01 00:00:00 1970 +0000
101 summary: mess c38516e9ed62 f
107 summary: mess bf757c081cd0 f
102 108
103 109 % rollback should not work after a histedit
104 110 no rollback information available
General Comments 0
You need to be logged in to leave comments. Login now