- Timestamp:
- May 26, 2020 9:34:42 AM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIpath.py
r4396 r4439 539 539 cmd = [svn,'switch',URL,fpath, 540 540 '--non-interactive','--trust-server-cert', 541 '--accept','theirs-conflict','--force' ]541 '--accept','theirs-conflict','--force','-rHEAD'] 542 542 if svnVersionNumber(svn) > 1.6: cmd += ['--ignore-ancestry'] 543 543 if proxycmds: cmd += proxycmds 544 if verbose: print(u"Loading files to "+fpath+u"\n from "+URL) 544 if verbose: 545 print(u"Loading files to "+fpath+u"\n from "+URL) 545 546 s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE) 546 547 out,err = MakeByte2str(s.communicate()) … … 566 567 return False 567 568 if verbose: 568 print('=== Output from svn switch'+(43*'=')) 569 s = '\nsvn command: ' 570 for i in cmd: s += i + ' ' 571 print(s) 572 print('\n=== Output from svn switch'+(43*'=')) 569 573 print(out.strip()) 570 574 print((70*'=')+'\n')
Note: See TracChangeset
for help on using the changeset viewer.