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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-02-02 15:38:13 UTC
  • mfrom: (7260.1.2 propose-base-url)
  • Revision ID: breezy.the.bot@gmail.com-20190202153813-ohq1qklj2znlut7y
Add .base_url property to Hoster.

Merged from https://code.launchpad.net/~jelmer/brz/propose-base-url/+merge/362565

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
3122
3122
            file_id = tt.inactive_file_id(conflict[1])
3123
3123
            # special-case the other tree root (move its children instead)
3124
3124
            if path_tree and path_tree.path2id('') == file_id:
3125
 
                    # This is the root entry, skip it
 
3125
                # This is the root entry, skip it
3126
3126
                continue
3127
3127
            tt.version_file(file_id, conflict[1])
3128
3128
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))