In my experience, if you try to do more than one rename or rename+changes to one file without a commit in the middle, this is going to give problems to fossil. There is some kind of bug there.
In one of my examples, it even left the database unusable, and I had to do something very strange to make it work again. RR El 10 de febrer de 2012 10:54, Lluís Batlle i Rossell <[email protected]> ha escrit: > On Fri, Feb 10, 2012 at 10:47:21AM +0100, Ramon Ribó wrote: >> > Additionally, "fossil merge -n | grep" will not find them, because they >> > appear >> > at stderr. >> >> What about?: >> >> fossil merge -n |& grep > > Well, of course. I know. But why the 'merge conflicts' don't go to stderr > then, > and only the warnings go to stderr? > :) > > OTH, I found why the merge lost the common ancestor. A checkin in the branch > we > merge from says: > F drivers/name2/CMakeLists.txt 7502f964180caca18854c362a143b03db759098b w > drivers/name1/CMakeLists.txt > F drivers/name2/DllMain.cpp e49061623fcbf8ab77bcf1116ac7b0c907ef9992 w > drivers/name1/DllMain.cpp > F drivers/name2/Name2FG.cpp a4be6efa0ecef9295a08b11eed5b432d0fb563f7 w > drivers/name1/Name1FG.cpp > F drivers/name2/Name2FG.hpp 9a911076e9a69570f07daab67a516e4d2e954eed w > drivers/name1/Name1FG.hpp > F drivers/name2/driver.cpp 0988a330147d0aaf0b61aca8b07bcc484abd83c8 w > drivers/name1/driver.cpp > > > There, most files were not only renamed, but also with some change in content. > Only DllMain did not have any change in content, and it was the only one > properly merged. The rest caused a "no common ancestor error". > > It looks to me that fossil gets confused in case of rename+changes in a single > commit. > > Anyone knowing the code can confirm this? I think it should be fixed. > Additionally, now we don't have an easy way to solve this, without causing > future 'no common ancestor' problems. Isn't it? > > It's like we can't do the merge properly unless fossil gets fixed. If you have > any trick we can use, let us know. > > Thank you, > Lluís. > > >> El 10 de febrer de 2012 10:30, Lluís Batlle i Rossell >> <[email protected]> ha escrit: >> > Hello, >> > >> > I had troubles in a big merge of hundreds of files, where five filse had a >> > message like this: >> > fossil: WARNING - no common ancestor: ... >> > >> > I did not notice them along the list of files, because the final abstract >> > of >> > merge conflicts does not include them. >> > >> > Additionally, "fossil merge -n | grep" will not find them, because they >> > appear >> > at stderr. >> > >> > I'd prefer those 'no common ancestor' to appear somehow at the final >> > abstract, >> > maybe counting as merge conflicts. What do you think? >> > >> > Now I've to investigate why I have a 'no common ancestor case', because I >> > think >> > this should not have happened. >> > >> > Regards, >> > Lluís >> > _______________________________________________ >> > fossil-users mailing list >> > [email protected] >> > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> _______________________________________________ >> fossil-users mailing list >> [email protected] >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
