Show More
@@ -114,7 +114,7 b' check histedit_source' | |||||
114 | folding and creating no new change doesn't break: |
|
114 | folding and creating no new change doesn't break: | |
115 | ------------------------------------------------- |
|
115 | ------------------------------------------------- | |
116 |
|
116 | |||
117 | folded content is dropped during a merge. |
|
117 | folded content is dropped during a merge. The folded commit should properly disapear. | |
118 |
|
118 | |||
119 | $ mkdir fold-to-empty-test |
|
119 | $ mkdir fold-to-empty-test | |
120 | $ cd fold-to-empty-test |
|
120 | $ cd fold-to-empty-test | |
@@ -138,16 +138,13 b' folded content is dropped during a merge' | |||||
138 | o 0:0189ba417d34 1+2+3 |
|
138 | o 0:0189ba417d34 1+2+3 | |
139 |
|
139 | |||
140 |
|
140 | |||
141 |
$ cat > |
|
141 | $ cat > $EDITED <<EOF | |
142 | > import re, sys |
|
142 | > pick 617f94f13c0f 1 +4 | |
143 | > rules = sys.argv[1] |
|
143 | > drop 888f9082bf99 2 +5 | |
144 | > data = open(rules).read() |
|
144 | > pick 251d831eeec5 3 +6 | |
145 | > data = re.sub(r'pick ([0-9a-f]{12} 2 \+5)', r'drop \1', data) |
|
|||
146 | > data = re.sub(r'pick ([0-9a-f]{12} 2 \+6)', r'fold \1', data) |
|
|||
147 | > open(rules, 'w').write(data) |
|
|||
148 | > EOF |
|
145 | > EOF | |
149 |
|
146 | |||
150 |
$ HGEDITOR= |
|
147 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 1 | |
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
148 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
152 | merging file |
|
149 | merging file | |
153 | warning: conflicts during merge. |
|
150 | warning: conflicts during merge. | |
@@ -158,7 +155,6 b' There were conflicts, we keep P1 content' | |||||
158 | should effectively drop the changes from +6. |
|
155 | should effectively drop the changes from +6. | |
159 | $ hg status |
|
156 | $ hg status | |
160 | M file |
|
157 | M file | |
161 | ? editor.py |
|
|||
162 | ? file.orig |
|
158 | ? file.orig | |
163 | $ hg resolve -l |
|
159 | $ hg resolve -l | |
164 | U file |
|
160 | U file |
General Comments 0
You need to be logged in to leave comments.
Login now