/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/Makefile.am

  • 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/Makefile.am
8
8
        command/init.py \
9
9
        command/resolve.py \
10
10
        command/revert.py \
11
 
        command/stage_add.py \
12
 
        command/stage_commit.py \
13
11
        command/stage_revert.py \
14
 
        command/stage_status.py \
15
12
        command/status.py \
16
13
        command/update.py \
17
14
        config.py \
24
21
        util.py \
25
22
        vcs/__init__.py \
26
23
        vcs/vcs.py \
27
 
        vcs/brz.py \
 
24
        vcs/bzr.py \
28
25
        walker/conflict.py \
29
26
        walker/copy_base.py \
30
27
        walker/copy_in.py \