Kiln » TortoiseHg » WinBuild Read More
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek tip fixed merge error

Changeset 7ebefbfd4472…

Parent 671a5c31fa1f…

by David Golub

Changes to one file · Browse files at 7ebefbfd4472 Showing diff from parent 671a5c31fa1f Diff from another changeset...

Change 1 of 1 Show Entire File setup.py Stacked
 
435
436
437
 
438
439
440
 
 
 
 
 
 
 
441
442
443
 
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
@@ -435,9 +435,17 @@
  if usefcshell:   shellrepo = '../fcshell'   shelldir = 'build/fcshell' + shellbranch = 'default'   else:   shellrepo = '../shellext'   shelldir = 'build/shellext' + shellbranch = branch + if force or not os.path.exists(shelldir): + run(r'if exist %s rmdir /s /q %s' % (shelldir, shelldir)) + run(r'hg clone file:%s -u %s file:%s' % (shellrepo, shellbranch, shelldir)) + else: + run(r'hg pull ../../' + shellrepo, shelldir) + run(r'hg update ' + shellbranch, shelldir)   if tag == 'tip':   run(r'hg update', shelldir)   else: