/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: 2022-06-27 15:51:01 UTC
  • Revision ID: tim@ed.am-20220627155101-znatxg4q91gqs1sc
additional change for brz->bzr

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict.py
20
20
 
21
21
 
22
22
import filecmp, os
23
 
from walker import Walker
 
23
from .walker import Walker
24
24
import stdhome.the as the
25
25
 
26
26
 
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()