Show More
@@ -1177,6 +1177,10 b' test stripping a working directory paren' | |||||
1177 | summary: commitA |
|
1177 | summary: commitA | |
1178 |
|
1178 | |||
1179 |
|
1179 | |||
|
1180 | stripping a set containing a merge properly reset file content, including items on other branches | |||
|
1181 | ||||
|
1182 | BROKEN, The added file should move to unknown, which is the behavior we have been seeing for other `hg strip --keep` call. | |||
|
1183 | ||||
1180 | $ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg |
|
1184 | $ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg | |
1181 | adding changesets |
|
1185 | adding changesets | |
1182 | adding manifests |
|
1186 | adding manifests | |
@@ -1185,6 +1189,50 b' test stripping a working directory paren' | |||||
1185 | new changesets 35358f982181:4cf5e92caec2 (2 drafts) |
|
1189 | new changesets 35358f982181:4cf5e92caec2 (2 drafts) | |
1186 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1190 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1187 |
|
1191 | |||
|
1192 | $ hg id | |||
|
1193 | 4cf5e92caec2 (new-branch) tip | |||
|
1194 | $ hg status --rev "f62c6c09b707" | |||
|
1195 | A bar.txt | |||
|
1196 | $ hg diff --rev "f62c6c09b707" | |||
|
1197 | diff -r f62c6c09b707 bar.txt | |||
|
1198 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
1199 | +++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000 | |||
|
1200 | @@ -0,0 +1,1 @@ | |||
|
1201 | +bar | |||
|
1202 | $ hg log -G -v --rev 35358f982181:: --patch | |||
|
1203 | @ changeset: 5:4cf5e92caec2 | |||
|
1204 | |\ branch: new-branch | |||
|
1205 | | ~ tag: tip | |||
|
1206 | | parent: 3:f62c6c09b707 | |||
|
1207 | | parent: 4:35358f982181 | |||
|
1208 | | user: test | |||
|
1209 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1210 | | description: | |||
|
1211 | | merge | |||
|
1212 | | | |||
|
1213 | | | |||
|
1214 | | diff -r f62c6c09b707 -r 4cf5e92caec2 bar.txt | |||
|
1215 | | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
1216 | | +++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000 | |||
|
1217 | | @@ -0,0 +1,1 @@ | |||
|
1218 | | +bar | |||
|
1219 | | | |||
|
1220 | o changeset: 4:35358f982181 | |||
|
1221 | | parent: 1:eca11cf91c71 | |||
|
1222 | ~ user: test | |||
|
1223 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1224 | files: bar.txt | |||
|
1225 | description: | |||
|
1226 | bar | |||
|
1227 | ||||
|
1228 | ||||
|
1229 | diff -r eca11cf91c71 -r 35358f982181 bar.txt | |||
|
1230 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
1231 | +++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000 | |||
|
1232 | @@ -0,0 +1,1 @@ | |||
|
1233 | +bar | |||
|
1234 | ||||
|
1235 | ||||
1188 | $ hg strip -k -r 35358f982181 |
|
1236 | $ hg strip -k -r 35358f982181 | |
1189 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg |
|
1237 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg | |
1190 | $ hg log -G |
|
1238 | $ hg log -G | |
@@ -1211,12 +1259,17 b' test stripping a working directory paren' | |||||
1211 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1259 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1212 | summary: commitA |
|
1260 | summary: commitA | |
1213 |
|
1261 | |||
1214 | $ hg diff |
|
1262 | ||
1215 | diff -r f62c6c09b707 bar.txt |
|
1263 | BROKEN: 'bar.txt' cannot possibly be clean since it is not part of the current | |
1216 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1264 | working copy parents. | |
1217 | +++ b/bar.txt Thu Jan 01 00:00:00 1970 +0000 |
|
1265 | ||
1218 | @@ -0,0 +1,1 @@ |
|
1266 | $ hg status -A | |
1219 | +bar |
|
1267 | C a | |
|
1268 | C b | |||
|
1269 | C bar.txt | |||
|
1270 | C foo.txt | |||
|
1271 | $ cat bar.txt | |||
|
1272 | bar | |||
1220 |
|
1273 | |||
1221 | Use delayedstrip to strip inside a transaction |
|
1274 | Use delayedstrip to strip inside a transaction | |
1222 |
|
1275 |
General Comments 0
You need to be logged in to leave comments.
Login now