Show More
@@ -1178,7 +1178,7 Abort unshelve while merging (issue5123) | |||||
1178 | $ hg add e |
|
1178 | $ hg add e | |
1179 | $ hg ci -m e |
|
1179 | $ hg ci -m e | |
1180 | $ hg shelve --patch |
|
1180 | $ hg shelve --patch | |
1181 |
default ( |
|
1181 | default (*s ago) changes to: b (glob) | |
1182 |
|
1182 | |||
1183 | diff --git a/c b/c |
|
1183 | diff --git a/c b/c | |
1184 | new file mode 100644 |
|
1184 | new file mode 100644 | |
@@ -1226,7 +1226,7 Abort unshelve while merging (issue5123) | |||||
1226 | e |
|
1226 | e | |
1227 | -- shelve should not contain `c` now |
|
1227 | -- shelve should not contain `c` now | |
1228 | $ hg shelve --patch |
|
1228 | $ hg shelve --patch | |
1229 |
default ( |
|
1229 | default (*s ago) changes to: b (glob) | |
1230 |
|
1230 | |||
1231 | diff --git a/d b/d |
|
1231 | diff --git a/d b/d | |
1232 | new file mode 100644 |
|
1232 | new file mode 100644 | |
@@ -1300,7 +1300,7 Abort unshelve while merging (issue5123) | |||||
1300 | A |
|
1300 | A | |
1301 | B |
|
1301 | B | |
1302 | $ hg shelve --patch |
|
1302 | $ hg shelve --patch | |
1303 |
default ( |
|
1303 | default (*s ago) changes to: add B to foo (glob) | |
1304 |
|
1304 | |||
1305 | diff --git a/foo b/foo |
|
1305 | diff --git a/foo b/foo | |
1306 | --- a/foo |
|
1306 | --- a/foo |
General Comments 0
You need to be logged in to leave comments.
Login now