This is more a Mercurial question than a Sage one. I have two branches of an hg repository: two separate clones, each with different sets of edits, in both case all committed. In branch1 there are several files added and deleted (forgotten). In branch2 there are no changes relevant to those files at all.
Now in branch1 I pull in all the changes from branch2 using hg pull, and (as prompted) follow that by hg merge and hg commit. In the current directory, the files which had been edited in branch1 are still edited, but the files which were added have disappeared completely. I could get them back (using hg serve and cut-and-paste) but that's stupid. I have read the mercurial documentation, and I don't think this is what is supposed to happen. Is there anything obvious (or otherwise) which I did wrong? This has happened to me twice now, and it is getting rather tedious. John -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
