[BUG] full local path to bundle don't accepted in merge/pull commands

Alexander Belchenko bialix at ukr.net
Sun Jul 30 14:17:56 BST 2006


Matthew D. Fuller пишет:
> On Sat, Jul 29, 2006 at 07:29:59PM +0300 I heard the voice of
> Alexander Belchenko, and lo! it spake thus:
>> E:\Bazaar-NG\__test\a>bzr merge E:\Bazaar-NG\__test\b\b.patch
>> bzr: ERROR: b.patch is not a source file in any tree.
> 
> I wonder if it might have to do with using the \-paths instead of
> /; everywhere that works uses /, even in the message for creating the
> bundle.

Hmmm...

Very very strange. But you're right. I change my test for using '\' for 
relative paths, and '/' for absolute paths. And relative paths works 
anyway, but absolute paths now also works. Very strange!

John, what you think, is it might be related to your local-path-to-url 
stuff?


Bazaar-NG\__test>bzr init a
E:\Bazaar-NG\__test>cd a
E:\Bazaar-NG\__test\a>echo spam  1>spam
E:\Bazaar-NG\__test\a>bzr add
added spam
E:\Bazaar-NG\__test\a>bzr commit -m initial
added spam
Committed revision 1.
E:\Bazaar-NG\__test\a>cd ..
E:\Bazaar-NG\__test>bzr branch a b
Branched 1 revision(s).
E:\Bazaar-NG\__test>cd b
E:\Bazaar-NG\__test\b>echo foo  1>spam
E:\Bazaar-NG\__test\b>bzr status
modified:
   spam
E:\Bazaar-NG\__test\b>bzr commit -m second
modified spam
Committed revision 2.
E:\Bazaar-NG\__test\b>bzr bundle --output=b.patch
Using saved location: E:/Bazaar-NG/__test/a/
E:\Bazaar-NG\__test\b>cd ..
E:\Bazaar-NG\__test>cd a
E:\Bazaar-NG\__test\a>bzr merge ..\b
All changes applied successfully.
E:\Bazaar-NG\__test\a>bzr status
modified:
   spam
pending merges:
   Alexander Belchenko 2006-07-30 second
E:\Bazaar-NG\__test\a>bzr revert
E:\Bazaar-NG\__test\a>bzr merge ..\b\b.patch
All changes applied successfully.
E:\Bazaar-NG\__test\a>bzr status
modified:
   spam
pending merges:
   Alexander Belchenko 2006-07-30 second
E:\Bazaar-NG\__test\a>bzr revert
E:\Bazaar-NG\__test\a>bzr merge E:/Bazaar-NG/__test/b/b.patch
All changes applied successfully.
E:\Bazaar-NG\__test\a>bzr status
modified:
   spam
pending merges:
   Alexander Belchenko 2006-07-30 second
E:\Bazaar-NG\__test\a>bzr revert
E:\Bazaar-NG\__test\a>bzr pull ..\b\b.patch
All changes applied successfully.
1 revision(s) pulled.
E:\Bazaar-NG\__test\a>bzr status
E:\Bazaar-NG\__test\a>bzr revno
2
E:\Bazaar-NG\__test\a>bzr uncommit --force
     2 Alexander Belchenko	2006-07-30
       second

The above revision(s) will be removed.
E:\Bazaar-NG\__test\a>bzr pull E:/Bazaar-NG/__test/b/b.patch
All changes applied successfully.
1 revision(s) pulled.


--
Alexander





More information about the bazaar mailing list