Problems tracking upstream

[Kevin Smith]

Matt Mackall wrote:
> On Wed, Jun 01, 2005 at 09:35:52AM -0400, Kevin Smith wrote:
> 
>>It took 40+ seconds, not counting any user interaction time. 
> 
> There's something weird going on with my server's latency. But it
> should really only take a couple seconds. hg -d merge will tell you
> what it's doing and -v will tell you how much data it sent.

I'll try to remember that for next time.

> Hmm. Looks like 'merge' comes from rcs. Some effort needs to be put
> into making that work out of the box and having a sane default for
> HGMERGE.

Yup. A (complete) list of dependencies in README would help for now.

>>I installed the tkdiff package, and finally got to the point that it 
>>brought up a diff pane pointing to README. But tkmerge still complained 
>>that it couldn't find merge, and no differences were shown between my 
>>copy of README and the one being pulled. I quit from tkmerge, ended up 
>>in vim for a comment (@#%@#$@#$!!!), and the process claimed to finish 
>>successfully.
> 
> Simply closing tkdiff should have aborted the merge - how did you quit?

I believe I chose the "Exit tkdiff" button.

Kevin