[Coco] Success! Re: HDB-DOS build fixes. Untested as of yet.

[David Ladd]

On Wed, Jan 2, 2013 at 11:41 AM, Juan Castro <jccyc1965 at gmail.com> wrote:

> I distinctly remember doing an hg pull and hg update before merging
> Robert's changes in and committing. Odd. But the previous diff can be
> retrieved from the server and your changes re-inserted. (Ain't souce
> control grand?) I can look at that tonight.
>

As far as the hg update and then merging I think only works between two
branches that are already in the repo.  If you copy over the files in your
directory I do not believe the merge will actually effect that.  Or at
least it has never worked that way with me in the past.

*shrug*