##// END OF EJS Templates
shelve: re-wrap now that the line fits
Jason R. Coombs -
r50417:52dd7a43 default
parent child Browse files
Show More
@@ -1184,9 +1184,7 b' def _dounshelve(ui, repo, basename, opts'
1184 # to the original pctx.
1184 # to the original pctx.
1185
1185
1186 activebookmark = _backupactivebookmark(repo)
1186 activebookmark = _backupactivebookmark(repo)
1187 tmpwctx, addedbefore = _commitworkingcopychanges(
1187 tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts, pctx)
1188 ui, repo, opts, pctx
1189 )
1190 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
1188 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
1191 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
1189 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
1192 branchtorestore = b''
1190 branchtorestore = b''
General Comments 0
You need to be logged in to leave comments. Login now