On Sun, Apr 11, 2010 at 4:42 PM, Gustaf Neumann <neum...@wu-wien.ac.at> wrote: > > PS: i had to do a "hg push -f ...". Not sure, if this is intentional. > Do the commits to tip look right?
All that's happened here is that you've made changes to your checkout without first updating it. In the meantime, Zoran has made changes and pushed them. If this were CVS it would refuse to let you commit. With mercurial obviously you can commit as it's local, but it will not let you push and will give you a warning. You ignored the warning by using -f :-) You are going to have to merge the two heads with 'hg merge' and then push that changeset. See: hg help merge. ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ naviserver-devel mailing list naviserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/naviserver-devel
