/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/command/update.py

  • Committer: Tim Marston
  • Date: 2016-02-13 14:18:32 UTC
  • Revision ID: tim@ed.am-20160213141832-o0odt4p3nuj97211
switched init command (and update command) to checking for conflicts prior to
deployment.copy_out(), and removed remaining references to CopyInConflict
(supposedly done in r24)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
99
99
                                ( the.repo.name, the.program.name ) )
100
100
 
101
101
                # copy-in changes to repo
102
 
                try:
103
 
                        deployment.copy_in()
104
 
                except deployment.CopyInConflicts as e:
105
 
                        raise the.program.FatalError(
106
 
                                'Files in %s differ too severly from %s:\n  %s\n' % \
107
 
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
102
                deployment.copy_in()
108
103
 
109
104
                # perform vcs update
110
105
                if the.verbose >= 1: print "updating %s" % the.repo.dir