Hi, 2010/9/19 James Legg <[email protected]>
> Unlike SVN, mercurial won't let you blindly push changes when other > changes have been pushed changes since your last update (even if the > files you changed weren't touched by anyone else). You should pull the > latest changes, update, and merge your changes with the remote ones: > i.e. hg pull, hg up, hg merge, check nothing was broken, and hg ci -m > "Merge". > > -James > > I know that mercurial does that and that's why I did a hg pull and hg update (not upgrade as I mentioned). No changes. Then I did my changes and committed them, followed by the push. I got the error, did a hg pull and hg update (to check for the reasons you mentioned): again no changes. Now after your mail (and some time later) I do again a hg pull and hg update and yes, it mentions: adding changesets adding manifests adding file changes added 2 changesets with 0 changes to 1 files Now that's a nice and very clear message "2 changesets with 0 changes to 1 files". The logic of that is really enlightening. :-) Now I do a "hg merge" and a 'hg commit -m "merged changes committed"' followed by the "push....." Now it mentions: remote: adding changesets remote: adding manifests remote: adding file changes remote: added 4 changesets with 5 changes to 6 files remote: Running changegroup hook remote: notify: sending 1 subscribers 1 changes remote: notify: sending 1 subscribers 1 changes remote: notify: sending 1 subscribers 1 changes remote: notify: sending 1 subscribers 1 changes Does it now send a mail to the last 4 committers/pushers? Does it/Wants it to update their local copies next time they pull? And why then if a hg pull always does that? Do they now have to merge as well? Also due to my actions/mistakes? I assume it is now OK? (please?, yes?) It still takes some time to get used to Mercurial. Thanks for your reply. Positive as ever, 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
