/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 doc/unrelated-merge.txt

  • Committer: Martin Pool
  • Date: 2005-07-11 22:20:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050711222004-4130f49c487f0bb8
patch from John

On Mac OSX /tmp is actually a symlink to /private/tmp
so _relpath() fails because the real full path is different.

The attached path just makes dtmp be expanded to it's real path, which
makes the tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/unrelated-merge.txt
 
1
****************************
 
2
Merging unrelated changesets
 
3
****************************
 
4
 
 
5
It ought to be possible to merge in even totally unrelated changesets,
 
6
by just treating them as patches.  It is possible that the file ids
 
7
will mismatch, in which case we could perhaps assume the filenames are
 
8
compatible. 
 
 
b'\\ No newline at end of file'