##// END OF EJS Templates
errors: drop trailing "!" for some errors about bookmarks...
Martin von Zweigbergk -
r46522:f0626acf default
parent child Browse files
Show More
@@ -355,15 +355,15 b' class pushoperation(object):'
355 bookmsgmap = {
355 bookmsgmap = {
356 b'update': (
356 b'update': (
357 _(b"updating bookmark %s\n"),
357 _(b"updating bookmark %s\n"),
358 _(b'updating bookmark %s failed!\n'),
358 _(b'updating bookmark %s failed\n'),
359 ),
359 ),
360 b'export': (
360 b'export': (
361 _(b"exporting bookmark %s\n"),
361 _(b"exporting bookmark %s\n"),
362 _(b'exporting bookmark %s failed!\n'),
362 _(b'exporting bookmark %s failed\n'),
363 ),
363 ),
364 b'delete': (
364 b'delete': (
365 _(b"deleting remote bookmark %s\n"),
365 _(b"deleting remote bookmark %s\n"),
366 _(b'deleting remote bookmark %s failed!\n'),
366 _(b'deleting remote bookmark %s failed\n'),
367 ),
367 ),
368 }
368 }
369
369
@@ -1166,7 +1166,7 b' Local push'
1166 searching for changes
1166 searching for changes
1167 no changes found
1167 no changes found
1168 pushkey-abort: prepushkey hook exited with status 1
1168 pushkey-abort: prepushkey hook exited with status 1
1169 abort: exporting bookmark @ failed!
1169 abort: exporting bookmark @ failed
1170 [255]
1170 [255]
1171
1171
1172 #endif
1172 #endif
@@ -1194,7 +1194,7 b' Using ssh'
1194 searching for changes
1194 searching for changes
1195 no changes found
1195 no changes found
1196 remote: pushkey-abort: prepushkey hook exited with status 1
1196 remote: pushkey-abort: prepushkey hook exited with status 1
1197 abort: exporting bookmark @ failed!
1197 abort: exporting bookmark @ failed
1198 [255]
1198 [255]
1199
1199
1200 $ hg -R ../issue4455-dest/ bookmarks
1200 $ hg -R ../issue4455-dest/ bookmarks
@@ -1205,7 +1205,7 b' Using ssh'
1205 searching for changes
1205 searching for changes
1206 no changes found
1206 no changes found
1207 remote: pushkey-abort: prepushkey hook exited with status 1
1207 remote: pushkey-abort: prepushkey hook exited with status 1
1208 exporting bookmark @ failed!
1208 exporting bookmark @ failed
1209 [1]
1209 [1]
1210
1210
1211 #endif
1211 #endif
@@ -1233,7 +1233,7 b' Using http'
1233 searching for changes
1233 searching for changes
1234 no changes found
1234 no changes found
1235 remote: pushkey-abort: prepushkey hook exited with status 1
1235 remote: pushkey-abort: prepushkey hook exited with status 1
1236 abort: exporting bookmark @ failed!
1236 abort: exporting bookmark @ failed
1237 [255]
1237 [255]
1238
1238
1239 $ hg -R ../issue4455-dest/ bookmarks
1239 $ hg -R ../issue4455-dest/ bookmarks
@@ -1244,7 +1244,7 b' Using http'
1244 searching for changes
1244 searching for changes
1245 no changes found
1245 no changes found
1246 remote: pushkey-abort: prepushkey hook exited with status 1
1246 remote: pushkey-abort: prepushkey hook exited with status 1
1247 exporting bookmark @ failed!
1247 exporting bookmark @ failed
1248 [1]
1248 [1]
1249
1249
1250 #endif
1250 #endif
@@ -1324,7 +1324,7 b' attempt to move the bookmark is rejected'
1324 searching for changes
1324 searching for changes
1325 no changes found
1325 no changes found
1326 remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
1326 remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
1327 abort: updating bookmark foo failed!
1327 abort: updating bookmark foo failed
1328 [255]
1328 [255]
1329 #endif
1329 #endif
1330 #if b2-binary
1330 #if b2-binary
General Comments 0
You need to be logged in to leave comments. Login now