← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-18 20:57:06 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1512.
  • Revision ID: john@arbash-meinel.com-20051118205706-825c182e74708a7e
[patch] Alexey Shamrin's patch for small win32 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
559
559
                if path == '.':
560
560
                    path = ''
561
561
                else:
562
 
                    assert path.startswith('.' + os.sep), "path is %s" % path
 
562
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
563
563
                path = path[2:]
564
564
            adjust_ids.append((path, id))
565
565
        if len(adjust_ids) > 0: