~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2011-10-27 15:29:57 UTC
mfrom: (6015.47.9 880701-resolve-duplicate)
mto: (6234.1.1 trunk) (6015.57.1 2.4) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev)
mto: This revision was merged to the branch mainline in revision 6236.
Revision ID: pqm@pqm.ubuntu.com-20111027152957-gfc64dky77azio9v

(vila) Generate a 'duplicate' conflict instead of a 'content' conflict when
the same path is involved in both branches. (Vincent Ladeuil)

added added

removed removed

3068

existing_file, new_file = conflict[2], conflict[1]

3069

else:

3070

existing_file, new_file = conflict[1], conflict[2]

3071

new_name = tt.final_name(existing_file)+'.moved'

3071

new_name = tt.final_name(existing_file) + '.moved'

3072

tt.adjust_path(new_name, final_parent, existing_file)

3073

new_conflicts.add((c_type, 'Moved existing file to',

3074

existing_file, new_file))