[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Problem with hg
From: |
Jordi Gutiérrez Hermoso |
Subject: |
Re: Problem with hg |
Date: |
Fri, 16 Aug 2013 09:15:44 -0400 |
On 15 August 2013 23:07, Michael D. Godfrey <address@hidden> wrote:
> [pbdsl3:octave] hg -v pull
> real URL is http://hg.savannah.gnu.org/hgweb/octave
> pulling from http://www.octave.org/hg/octave
> searching for changes
> no changes found
> divergent bookmark @ stored as @default
> [pbdsl3:octave] hg -v update
> abort: crosses branches (merge branches or update --check to force update)
I believe this may have happened when that extra head got pushed.
If you look at "hg book" and "hg glog" you should see that the
situation is that your own @ bookmark was on a different head. The
divergent @ from Savannah has been renamed to @default (because
Savannah is your default path, `hg paths`).
This extra head has now been merged again, so I think the resolution
should be simple. Try again the following:
hg pull
hg up @ ## Make your own @ bookmark active
hg up ## Update the @ bookmark. This should also resolve the divergence.
HTH,
- Jordi G. H.
- Problem with hg, Michael D. Godfrey, 2013/08/15
- Re: Problem with hg,
Jordi Gutiérrez Hermoso <=