On 10/16/2012 3:48 AM, Amos Jeffries wrote:
cd /path/to/local/trunk/checkout
bzr update
cd /your/branch/directory
bzr merge /path/to/local/trunk/checkout ("squid-new/trunk" in the
above example)
I did that already and I get error while updating:
##start
$ bzr update
Doing on-the-fly conversion from RepositoryFormat2a() to
RepositoryFormatKnitPack6().
This may take some time. Upgrade the repositories to the same format for
better performance.
bzr: ERROR:
KnitPackRepository('file:///home/eliezer/squid-repo/.bzr/repository/')
is not compatible with
CHKInventoryRepository('http://bzr.squid-cache.org/bzr/squid3/.bzr/repository/')
different rich-root support
##end
it's kind of weird since for the new branch seems to work fine with
updates and everything.
I was thinking of maybe reverting the new repo to older revision(since
it's 600 + patch) and then patch it using the diff file I have as last
resort but I have never done something like that(which can might have
side effects).
I'm not such a big user of patch but I have seen before that it can be
used to patch newer versions if nothing major was done to the source
files in the patch.
Any help welcome.
then resolve any conflicts, commit (we usually label such merges "merge
from trunk") and re-test.
Amos
Thanks,
Eliezer
