[U-Boot-Users] Error when updating local git repo
Hi Wolfgang,
I'm working with a local U-Boot repository that periodically is updated with your public one. I encountered the following error when trying to update it:
[llandre@linuxserver u-boot-denx-dave]$ cg-update Recovering from a previously interrupted fetch... WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future! Fetching head... receiving file list ... done .git/refs/heads/.origin-fetching
sent 94 bytes received 144 bytes 158.67 bytes/sec total size is 41 speedup is 0.17 Fetching objects... receiving file list ... done
sent 79 bytes received 47423 bytes 13572.00 bytes/sec total size is 23238354 speedup is 489.21 Fetching tags... receiving file list ... done
sent 81 bytes received 1797 bytes 1252.00 bytes/sec total size is 5002 speedup is 2.66
Applying changes... Merging 0a69b26ed6fe3184cab86872589c27b076e6cb8e -> e6b6d16de73de6a76e2ec4338291e828b860f040 to 50ecf0766fb61883a94c4e703990cb3b5bc1bec1... ... Auto-merging CHANGELOG merge: warning: conflicts during merge ... Auto-merging MAINTAINERS ... Auto-merging MAKEALL ... Auto-merging Makefile ... Auto-merging board/amcc/bamboo/bamboo.c MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'. ... Auto-merging board/amcc/yellowstone/yellowstone.c ... Auto-merging board/amcc/yosemite/yosemite.c MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'. MERGE ERROR: File board/prodrive/p3p440/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/prodrive/p3p440/u-boot.lds~merge~base', the modified one as 'board/prodrive/p3p440/u-boot.lds~origin'. ... Auto-merging board/tqm834x/pci.c MERGE ERROR: File board/tqm85xx/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/tqm85xx/u-boot.lds~master' and 'board/tqm85xx/u-boot.lds~origin'. ... Auto-merging cpu/ppc4xx/405gp_pci.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/cpu.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/spd_sdram.c ... Auto-merging cpu/ppc4xx/start.S ... Auto-merging include/configs/TQM5200.h ... Auto-merging include/configs/TQM834x.h ... Auto-merging include/configs/bamboo.h ... Auto-merging include/configs/o2dnt.h ... Auto-merging include/ppc440.h
Conflicts during merge. Do cg-commit after resolving them. cg-reset will cancel the merge.
What the following error messages mean?
MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'.
MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'.
Best regards, llandre
DAVE Electronics System House - R&D Department web: http://www.dave-tech.it email: r&d2@dave-tech.it
In message 43B10360.2050704@dave-tech.it you wrote:
I'm working with a local U-Boot repository that periodically is updated with your public one. I encountered the following error when trying to update it:
[llandre@linuxserver u-boot-denx-dave]$ cg-update Recovering from a previously interrupted fetch... WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future!
You may want to pay heed to this warning...
What the following error messages mean?
MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each!
The file board/amcc/luan/u-boot.lds was added in both branches which you are trying to merge, but the versions in both branches are different. You will have to decide which one to use or what else to do.
MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other!
The file board/esd/cms700/u-boot.lds was removed in one branch but modified in the other one. You will have to decide if it is to be removed or if the modified version should be used or what else to do.
Ummm.. to me the error messages are pretty clear. What exactly is it what you don't understand?
Best regards,
Wolfgang Denk
Hi,
WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future!
You may want to pay heed to this warning...
ok. I followed the example here: http://source.denx.net/cgi-bin/gitweb.cgi. Do you suggest to use http instead?
What the following error messages mean?
...
Ummm.. to me the error messages are pretty clear. What exactly is it what you don't understand?
I have two local repos. One is just a clone of your public repo (u-boot-denx). The other one (u-boot-denx-dave) exhibits the problem I reported in the previous mail. The thing that looks weird to me is that the first repo (u-boot-denx) does not exhibit it. On the other hand, I'm pretty sure that in u-boot-denx-dave I did not touch those files.
In message 43B40B6C.4030504@dave-tech.it you wrote:
ok. I followed the example here: http://source.denx.net/cgi-bin/gitweb.cgi. Do you suggest to use http instead?
This is the official recommendation. I have to admit that I usually use rsync myself, especially for the initial cloning, as it's much faster.
I have two local repos. One is just a clone of your public repo (u-boot-denx). The other one (u-boot-denx-dave) exhibits the problem I
How exactly did you create this second repo, and what exactly did you try when attempting to merge?
Best regards,
Wolfgang Denk
Hi,
http://source.denx.net/cgi-bin/gitweb.cgi. Do you suggest to use http instead?
This is the official recommendation. I have to admit that I usually use rsync myself, especially for the initial cloning, as it's much faster.
To switch the protocol I have to change .git/branches/origin from rsync://source.denx.net/git/u-boot.git to http://source.denx.net/git/u-boot.git right?
I have two local repos. One is just a clone of your public repo (u-boot-denx). The other one (u-boot-denx-dave) exhibits the problem I
How exactly did you create this second repo, and what exactly did you try when attempting to merge?
u-boot-denx-dave was created by cloning the public repo. I don't remember if I cloned your repo directly (cg-clone rsync://...) or if I cloned the local repo u-boot-denx, it happend months ago. Then I created 4 new branches for ARM9 platforms and performed several commits and merges from these branches to master. Finally I issued cg-update to merge new stuff commited to the public repo in the meanwhile and I got the messages I sent a couple of days ago.
participants (2)
-
llandre -
Wolfgang Denk