On 2011-03-22 11:54, s...@pobox.com wrote: > I came across a new message I neither understood before or after searching > for it on Google (and thus the documentation): > > % hg pull -u > pulling from /Users/skip/src/hgpython/2.6 > searching for changes > adding changesets > adding manifests > adding file changes > added 242 changesets with 766 changes to 263 files > abort: crosses branches (use 'hg merge' or use 'hg update -c') > > What does "crosses branches" mean? From the couple instances I saw in the > docs I found I couldn't tell. > > This was in my 2.5 repository, which I recall Guido saying he updated > recently (copyright file or something?). > > I should point out that I have a local commit which I don't want to push. > That fixes the build problem with the unexpanded $HeadURL$ svn keyword: > > changeset: 68309:c3caaf979b9e > branch: 2.5 > parent: 68263:7790ad8332ba > user: Skip Montanaro <s...@pobox.com> > date: Sun Mar 06 21:31:25 2011 -0600 > summary: manually expand the defunct HeadURL subversion keyword
Since you have a local change, you cannot use hg pull -u (or rather, hg update). Hg wouldn't know where to update to since there are 2 heads in the branch you're on: the new head from the server and your own head with your change. There are two possibilities: hg merge + hg commit to merge your change with the change from the server, or hg rebase (after you enable the extension and with extra arguments to specify source and destination revisions). This would take your change and graft if on top of the head from the server. Instead of using hg pull -u, you could have used hg pull --rebase (after enabling the extension) to do the rebase automatically. But that is for next time. -- Sjoerd Mullender
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
