[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: regression in eigs
From: |
Jordi Gutiérrez Hermoso |
Subject: |
Re: regression in eigs |
Date: |
Mon, 04 Nov 2013 14:25:24 -0500 |
On Mon, 2013-11-04 at 08:56 +0100, c. wrote:
> I take it back, it seems I can't push the changeset without creating
> a new head,
When this happens, try to pull and rebase your head on top of what you
just pulled:
hg pull --rebase
Sometimes, depending if you checked out an older revision, this may
fail. In that case, you can rebase after the fact. First do "hg heads"
to see what the head that you want to rebase is, and then do
# To switch back to @
hg update -r @ --check
# Rebase your head back on top of @
hg rebase -b REV_OF_YOUR_HEAD
# Advance the @ bookmark to your rebased head
# (older hg requires --force here)
hg book @
HTH,
- Jordi G. H.