Hi Kornel, 2010/5/17 Kornel Benko <[email protected]>
> Am Montag 17 Mai 2010 schrieb Harry van der Wolf: > ... > >*abort: push creates new remote heads! > >(did you forget to merge? use push -f to force) > ... > > So I did a > > 'hg merge' > > and then a > > 'hg commit' > > as hg told me to do so: > > Then I did again the > > hg push ssh:// > [email protected]/hgroot/hugin/hugin > > > > Now I now have the idea that I redid/recommitted Thomas changes. > > > > Can anybody explain whether this is correct behavior or what I did wrong? > > I have seen this often at enblend, it made me cry .. > > OK, now I can go to sleep tonight without feeling to insecure. I do think this will happen more often. In your case I think you worked on the cmake part whereas Christopher worked on the automake part. So even though hg complained I think there were never real conflicts. We will see what happens to the hg trunk when developers "touch" the same files. hg should resolve that correctly but we (well, that is: I) need to have clear what to do in such a situation. I will re-read the documentation. > > And how we should handle this in the future? > > I always try to > hg pull > hg update > > before commiting. This above mentioned behaviour was one thing I newer > liked. > > Well, this is exactly what I mean if you do it like that. Your changes are not yet committed and the next set of changes from the trunk will be rolled over them. I think that went OK as Christoph and you were working on different parts. I think you should commit your changes first and then do the: hg pull hg update hg merge hg push (or so). As mentioned: I will re-read the hg documentation. Harry -- You received this message because you are subscribed to the Google Groups "hugin and other free panoramic software" group. A list of frequently asked questions is available at: http://wiki.panotools.org/Hugin_FAQ 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/hugin-ptx
