/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 bzrlib/workingtree.py

  • Committer: Matthieu Moy
  • Date: 2006-09-09 18:01:44 UTC
  • mto: (2009.1.1 update-r)
  • mto: This revision was merged to the branch mainline in revision 4923.
  • Revision ID: Matthieu.Moy@imag.fr-20060909180144-3a3e92fbaaee00c2
Fixed bad conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1612
1612
        # local work is unreferenced and will appear to have been lost.
1613
1613
        # 
1614
1614
        result = 0
 
1615
        try:
 
1616
            last_rev = self.get_parent_ids()[0]
 
1617
        except IndexError:
 
1618
            last_rev = None
1615
1619
        if revision is None:
1616
 
            try:
1617
 
                last_rev = self.get_parent_ids()[0]
1618
 
            except IndexError:
1619
 
                last_rev = None
 
1620
            revision = self.branch.last_revision()
1620
1621
        else:
1621
1622
            if revision not in self.branch.revision_history():
1622
1623
                raise errors.NoSuchRevision(self.branch, revision)
1623
 
        if revision != self.last_revision():
 
1624
        if last_rev != revision:
1624
1625
            # merge tree state up to new branch tip.
1625
1626
            basis = self.basis_tree()
1626
1627
            to_tree = self.branch.repository.revision_tree(revision)