On Sun, May 23, 2010 at 03:01:41PM -0500, sc wrote:
> about the only thing i know i can do and do successfully is the 
> clone, which i've done several times now but can't seem to get 
> back to 7.3 -- what i am winding up with is 7.2.437

When you first clone the repository, you are in the default branch.  You
can see this by running “hg branch” in your checkout.  That command will
always tell you what your current branch is.  If you want to build 7.3,
then you first need to switch to the vim73 branch.  You do this by
running “hg update vim73”.  Now any commits you make will be on the
vim73 branch.

When you run “hg pull” to get the latest changes, this simply pulls the
latest changes into your local repository.  You still have to update
your branch to use those changes.  If you haven't made any commits
(i.e., your branch doesn't deviate from Bram's), then you can simply run
“hg update” to advance your current branch to its tip.

If you have made commits, then you'll need to merge the head that was
created when you did a pull.  This should simply be a matter of running
“hg merge”, but you can always see what Mercurial will try to do before
actually performing the merge -- “hg merge -P”.

I'd really suggest going through <http://hginit.com/>,
<http://hgbook.red-bean.com>, and
<http://mercurial.selenic.com/wiki/Tutorial>.

-- 
James
GPG Key: 1024D/61326D40 2003-09-02 James Vega <[email protected]>

Attachment: signature.asc
Description: Digital signature

Raspunde prin e-mail lui