josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stash: respect -k flag again

Browse Source
This commit is contained in:
Josh Holtrop 2013-03-11 20:51:56 -04:00
parent 0587d73472
commit 6f4a88737d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jsvn
View File

@ -1360,10 +1360,11 @@ def stash_save_h(args, svn, out, config, keep, patch):
if len(revert_list) == 0: if len(revert_list) == 0:
out.write('No changes stashed.\n') out.write('No changes stashed.\n')
else: else:
for rf in revert_list: if not keep:
Popen([svn, 'revert', rf], stdout=PIPE).wait() for rf in revert_list:
if r_fname != '': Popen([svn, 'revert', rf], stdout=PIPE).wait()
Popen([svn, 'patch', r_fname], stdout=PIPE).wait() if r_fname != '':
Popen([svn, 'patch', r_fname], stdout=PIPE).wait()
if s_fname != '': if s_fname != '':
stash_idx = get_next_stash_idx(svn) stash_idx = get_next_stash_idx(svn)
stash_fname = get_stash_fname(svn, stash_idx) stash_fname = get_stash_fname(svn, stash_idx)