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

Committer: Breezy landing bot
Author(s): Jelmer Vernooĳ
Date: 2020-08-22 16:54:29 UTC
mfrom: (7490.134.2 merge-copy)
mto: (7520.1.3 merge-3.1) (7490.40.106 work) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
mto: This revision was merged to the branch mainline in revision 7521.
Revision ID: breezy.the.bot@gmail.com-20200822165429-g3ivw8rcgdb0lxfb

Fix merging of copy operations.

Merged from https://code.launchpad.net/~jelmer/brz/merge-copy/+merge/389688

files modified:
breezy/bzr/inventorytree.py

breezy/delta.py

breezy/git/transform.py

breezy/merge.py

breezy/tests/test_merge.py

breezy/tree.py

Show diffs side-by-side

added added

removed removed

breezy/git/transform.py

786

786

elif c[0] == 'parent loop':

787

787

# TODO(jelmer): This should not make it to here

788

788

yield TextConflict(fp.get_path(c[2]))

789

elif c[0] == 'path conflict':

790

yield TextConflict(fp.get_path(c[1]))

789

791

else:

790

792

raise AssertionError('unknown conflict %s' % c[0])

791

793

Older »