← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-09-12 12:49:28 UTC
  • mfrom: (1092.2.12)
  • mto: (1092.2.15)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050912124928-1da074d2e9c3344b
merge from baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
import os.path
 
18
import os
19
19
import tempfile
20
20
import shutil
21
21
import errno
357
357
            if path == '.':
358
358
                path = ''
359
359
            else:
360
 
                assert path.startswith('./'), "path is %s" % path
 
360
                assert path.startswith('.' + os.sep), "path is %s" % path
361
361
            path = path[2:]
362
362
        adjust_ids.append((path, id))
363
363
    if len(adjust_ids) > 0: