Dan Pascu wrote: > On 22 Apr 2010, at 10:30, Sittampalam, Ganesh wrote: >
>> Is the message preceded by something like "lossy conversion of >> complicated conflict"? > > No. That's all it said. However it may repeat the message as it finds > more conflicting files later (it outputs the same message but with an > updated file list). Like this: > > We have conflicts in the following files: > ./.boring ./README ./cjson.c ./debian/changelog ./debian/compat > > We have conflicts in the following files: > ./.boring ./README ./cjson.c ./debian/changelog ./debian/compat ./ > jsontest.py ./setup.py Finished converting. > > I should also mention that this is not an isolated case. I've seen > this with every repository I tried to convert (tried 2-3). > > Maybe the message is harmless because darcs handled the conflicts. > But in this case it should be more user friendly, like: "Solved > conflicts in the following files:". Such a message would prevent the > user from getting confused about the result. That's why I asked if > someone knowledgeable in the internals can clarify what that message > means and possibly rephrase it in case the conflicts were handled > successfully to avoid confusion. Well, I am knowledgeable in the internals :-) I agree we should improve the message. But I don't fully understand what might be going on in this case if there's no message about lossy conversion. Are the repos you're converting available publicly or can they be made so? Cheers, Ganesh =============================================================================== Please access the attached hyperlink for an important electronic communications disclaimer: http://www.credit-suisse.com/legal/en/disclaimer_email_ib.html =============================================================================== _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
