/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/walker/conflict.py

  • Committer: Tim Marston
  • Date: 2014-04-12 12:53:54 UTC
  • Revision ID: tim@ed.am-20140412125354-64aysxvaz7nnk8hm
make verbose levels clearer

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/walker/conflict.py
40
40
                self.src_dir = the.repo.full_dir
41
41
                self.dst_dir = the.full_home_dir
42
42
                self.walk_list = walk_files if walk_files is not None else \
43
 
                                                 self.generate_walk_list()
 
43
                                                 self.generate_walk_list( the.repo.full_dir )
44
44
 
45
45
                self.ignore_files = ignore_files
46
46
                self.changed = list()