On Dec 18, 11:12 am, DenesL <[email protected]> wrote: .... > > I am not saying it was hg's fault, it could have been the client or a > PIBKAC (problem is between the keyboard and chair), I just don't know > what went wrong or where.
:-) > > > Unlikely... more likely a merge effect. > > > Denes: did you use 'hg pull' or 'hg merge'? > > I used TortoiseHG Update... I'm not sure how Toirtoise handles that (it does things for you) - after a pull, if you've made local changes, you need to merge; if not, you need to run 'hg update' (overwrite with new changed, in effect). > > > Suggest next time, a full clean repository clone in a separate space - > > then at least you'd have the difference between the trees to inspect, > > and would not have this "mystery". > > Download everything every time? What I do, Denes, is I have a local clone where I never make any changes; If I ever have any questions about merge effects, I compare against that "pristine" copy. Bzr would fail to update after some number of updates, and eventually merge (on other projects too); not sure how hg is after a long, long time of pulling in new changes (eventually, source tree changes can affect this). Because of this, when in doubt, I just throw away my clean tree, and do a new clone (I now am in the habit of doing this every couple of months regardless). It is then trivially easy to copy the directory of my application to the clean-clone, and compare behavior - if anything is different, I look to what the differences are between the base (admin, gluon) files... and usually just jump to development on a cleaner clone. In this case, you would have an easy way to diff (beyondCompare is nice, convenient for this - even on Linux; but on Linux, Kompare works well on directories too...)... Hope that helps. Regards, - Yarko > > > > > > > Regards, > > - Yarko -- You received this message because you are subscribed to the Google Groups "web2py-users" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/web2py?hl=en.
