/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/dir.py

  • Committer: Jelmer Vernooij
  • Date: 2020-01-19 03:33:47 UTC
  • mfrom: (7451 work)
  • mto: This revision was merged to the branch mainline in revision 7453.
  • Revision ID: jelmer@jelmer.uk-20200119033347-77uno2aeazuxmvy8
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/dir.py
207
207
                    subtrees = []
208
208
                for path in subtrees:
209
209
                    target = urlutils.join(url, urlutils.escape(path))
210
 
                    sublocation = source_branch.reference_parent(
 
210
                    sublocation = wt.reference_parent(
211
211
                        path, possible_transports=possible_transports)
 
212
                    if sublocation is None:
 
213
                        trace.warning(
 
214
                            'Ignoring nested tree %s, parent location unknown.',
 
215
                            path)
 
216
                        continue
212
217
                    sublocation.controldir.sprout(
213
218
                        target, basis.get_reference_revision(path),
214
219
                        force_new_repo=force_new_repo, recurse=recurse,