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

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
140
140
                pass
141
141
            elif overwrite or ref_name not in target_repo._git.refs:
142
142
                target_repo._git.refs[ref_name] = unpeeled or peeled
143
 
                updates[tag_name] = self.repository.lookup_foreign_revision_id(
144
 
                    peeled)
 
143
                try:
 
144
                    updates[tag_name] = (
 
145
                        self.repository.lookup_foreign_revision_id(peeled))
 
146
                except KeyError:
 
147
                    trace.warning('%s does not point to a valid object',
 
148
                                  tag_name)
 
149
                    continue
145
150
            else:
146
 
                source_revid = self.repository.lookup_foreign_revision_id(
147
 
                    peeled)
148
151
                try:
 
152
                    source_revid = self.repository.lookup_foreign_revision_id(
 
153
                        peeled)
149
154
                    target_revid = target_repo.lookup_foreign_revision_id(
150
155
                        target_repo._git.refs[ref_name])
151
156
                except KeyError: