/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/workingtree.py

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
428
428
        user_dirs = []
429
429
 
430
430
        def call_action(filepath, kind):
 
431
            if filepath == '':
 
432
                return
431
433
            if action is not None:
432
434
                parent_path = posixpath.dirname(filepath)
433
435
                parent_id = self.path2id(parent_path)
503
505
                            continue
504
506
                        if subp in conflicts_related:
505
507
                            continue
506
 
                        call_action(filepath, kind)
 
508
                        call_action(subp, kind)
507
509
                        if save:
508
510
                            self._index_add_entry(subp, kind)
509
511
                        added.append(subp)