[Gnu-arch-users] Re: bazaar bug #385 (Re: Stabilizing Bazaar?)

[Robert Widhopf-Fenk]

On Friday, May 20, 2005 at 01:39:00, Matthieu Moy wrote:
> Robert Widhopf-Fenk <address@hidden> writes:
> 
> > Well I have {arch}/++default-version file but still get this
> > problem.
> 
> Do you have it in your pristine tree? I mean, it something like
> 
> {arch}/++pristine-trees/unlocked/xtla/xtla--main/xtla--main--0.9\
> /address@hidden/xtla--main--0.9--patch-6/{arch}/++default-version

yeah this is the problem ...

~/<2>xtla--main--0.9/{arch} > cp ./++default-version  
./++pristine-trees/unlocked/xtla/xtla--main/xtla--main--0.9/address@hidden/xtla--main--0.9--patch-6/\{arch}/
~/<2>xtla--main--0.9/{arch} > cd ..
~/<1>arched/xtla--main--0.9 > 
/home/fenk/prog/arched/bazaar-build/bazaar/src/,,built/baz/baz/baz merge 
address@hidden/xtla--main--0.9--patch-80
* build reference tree for address@hidden/xtla--main--0.9--patch-80
* Scanning for full-tree revision: ..............................
* from revision library: address@hidden/xtla--main--0.9--patch-51
* Applying 29 revisions: .............................
* Searching for best merge point: .. done
* merge by 
delta(address@hidden/xtla--main--0.9--patch-6,address@hidden/xtla--main--0.9--patch-80)[/home/fenk/prog/arched/xtla--main--0.9]
* performing merge
* Comparing FROM and TO
....
* Merging into tree
A   {arch}/xtla/xtla--main/xtla--main--0.9/address@hidden/patch-log/patch-78
A   {arch}/xtla/xtla--main/xtla--main--0.9/address@hidden/patch-log/patch-79
A   {arch}/xtla/xtla--main/xtla--main--0.9/address@hidden/patch-log/patch-80
M   lisp/xtla-core.el