/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:21:53 UTC
  • Revision ID: tim@ed.am-20160213142153-68g7pzq0au6bejep
fixed init command

Show diffs side-by-side

added added

removed removed

123
123
                if message:
124
124
                        raise the.program.FatalError(
125
125
                                'there were conflicts...\n' + message )
 
126
 
126
127
                # copy-out changes from repo
127
128
                deployment.copy_out()
128
129