/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/osutils.py

  • Committer: Andrew Bennetts
  • Date: 2010-05-03 04:08:50 UTC
  • mfrom: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100503040850-wm4v7qx6wx3u7ns1
Merge lp:bzr/2.1 into lp:bzr, including fix for #528041.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1147
1147
 
1148
1148
 
1149
1149
def relpath(base, path):
1150
 
    """Return path relative to base, or raise PathNotChild exception.
 
1150
    """Return path relative to base, or raise exception.
1151
1151
 
1152
1152
    The path may be either an absolute path or a path relative to the
1153
1153
    current working directory.
1155
1155
    os.path.commonprefix (python2.4) has a bad bug that it works just
1156
1156
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
1157
1157
    avoids that problem.
1158
 
 
1159
 
    NOTE: `base` should not have a trailing slash otherwise you'll get
1160
 
    PathNotChild exceptions regardless of `path`.
1161
1158
    """
1162
1159
 
1163
1160
    if len(base) < MIN_ABS_PATHLENGTH: