← Back to branch summary

~lifeless/ubuntu/lucid/bzr/2.1.2-sru

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-06-27 15:23:34 UTC
  • mfrom: (1.3.1 upstream) (3.1.78 karmic)
  • Revision ID: james.westby@ubuntu.com-20090627152334-u3smexjpaolh96qd
* New upstream release.
* Bump standards version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import errno
462
462
                               **kwargs)
463
463
 
464
464
    def _do_merge_to(self, merge):
 
465
        if self.other_branch is not None:
 
466
            self.other_branch.update_references(self.this_branch)
465
467
        merge.do_merge()
466
468
        if self.recurse == 'down':
467
469
            for relpath, file_id in self.this_tree.iter_references():
546
548
        :param working_tree: The working tree to apply the merge to
547
549
        :param this_tree: The local tree in the merge operation
548
550
        :param base_tree: The common tree in the merge operation
549
 
        :param other_tree: The other other tree to merge changes from
 
551
        :param other_tree: The other tree to merge changes from
550
552
        :param interesting_ids: The file_ids of files that should be
551
553
            participate in the merge.  May not be combined with
552
554
            interesting_files.