/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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-09-01 20:21:26 UTC
  • mfrom: (7067.13.16 python3-y)
  • Revision ID: breezy.the.bot@gmail.com-20180901202126-6r9fzlprpqcky4k5
Various fixes for tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-y/+merge/353193

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
495
495
                    if kind == "directory":
496
496
                        user_dirs.append(subp)
497
497
                    else:
498
 
                        if subp in self.index:
 
498
                        (index, subpath) = self._lookup_index(subp.encode('utf-8'))
 
499
                        if subpath in index:
499
500
                            # Already present
500
501
                            continue
501
502
                        if subp in conflicts_related: