Show More
@@ -210,6 +210,6 b" Check that unshelve isn't broken by halt" | |||||
210 | merge halted after failed merge (see hg resolve) |
|
210 | merge halted after failed merge (see hg resolve) | |
211 | [240] |
|
211 | [240] | |
212 | $ hg shelve --list |
|
212 | $ hg shelve --list | |
213 |
default (* ago) |
|
213 | default (*s ago) * changes to: foo (glob) | |
214 | $ hg unshelve --abort |
|
214 | $ hg unshelve --abort | |
215 | unshelve of 'default' aborted |
|
215 | unshelve of 'default' aborted |
@@ -976,7 +976,7 b' Test shelve --keep' | |||||
976 | Test shelve --delete |
|
976 | Test shelve --delete | |
977 |
|
977 | |||
978 | $ hg shelve --list |
|
978 | $ hg shelve --list | |
979 |
default (*s ago) |
|
979 | default (*s ago) * changes to: create conflict (glob) | |
980 | $ hg shelve --delete doesnotexist |
|
980 | $ hg shelve --delete doesnotexist | |
981 | abort: shelved change 'doesnotexist' not found |
|
981 | abort: shelved change 'doesnotexist' not found | |
982 | [10] |
|
982 | [10] | |
@@ -1209,7 +1209,7 b' Abort unshelve while merging (issue5123)' | |||||
1209 | $ hg add e |
|
1209 | $ hg add e | |
1210 | $ hg ci -m e |
|
1210 | $ hg ci -m e | |
1211 | $ hg shelve --patch |
|
1211 | $ hg shelve --patch | |
1212 |
default (*s ago) |
|
1212 | default (*s ago) * changes to: b (glob) | |
1213 |
|
1213 | |||
1214 | diff --git a/c b/c |
|
1214 | diff --git a/c b/c | |
1215 | new file mode 100644 |
|
1215 | new file mode 100644 | |
@@ -1258,7 +1258,7 b' Abort unshelve while merging (issue5123)' | |||||
1258 | e |
|
1258 | e | |
1259 | -- shelve should not contain `c` now |
|
1259 | -- shelve should not contain `c` now | |
1260 | $ hg shelve --patch |
|
1260 | $ hg shelve --patch | |
1261 |
default (*s ago) |
|
1261 | default (*s ago) * changes to: b (glob) | |
1262 |
|
1262 | |||
1263 | diff --git a/d b/d |
|
1263 | diff --git a/d b/d | |
1264 | new file mode 100644 |
|
1264 | new file mode 100644 | |
@@ -1357,7 +1357,7 b' Abort unshelve while merging (issue5123)' | |||||
1357 | A |
|
1357 | A | |
1358 | B |
|
1358 | B | |
1359 | $ hg shelve --patch |
|
1359 | $ hg shelve --patch | |
1360 |
default (*s ago) |
|
1360 | default (*s ago) * changes to: add B to foo (glob) | |
1361 |
|
1361 | |||
1362 | diff --git a/foo b/foo |
|
1362 | diff --git a/foo b/foo | |
1363 | --- a/foo |
|
1363 | --- a/foo |
General Comments 0
You need to be logged in to leave comments.
Login now