← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tag.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tag.py
269
269
    def _reconcile_tags(self, source_dict, dest_dict, overwrite):
270
270
        """Do a two-way merge of two tag dictionaries.
271
271
 
272
 
        only in source => source value
273
 
        only in destination => destination value
274
 
        same definitions => that
275
 
        different definitions => if overwrite is False, keep destination
276
 
            value and give a warning, otherwise use the source value
 
272
        * only in source => source value
 
273
        * only in destination => destination value
 
274
        * same definitions => that
 
275
        * different definitions => if overwrite is False, keep destination
 
276
          value and give a warning, otherwise use the source value
277
277
 
278
278
        :returns: (result_dict,
279
279
            [(conflicting_tag, source_target, dest_target)])