On Fri, Sep 20, 2013 at 7:11 PM, Ross Boylan <[email protected]> wrote:
> I pulled from the wrong repository into the local "Ross" project and
> then did an update.
> I noticed lots of messages "removing filexxx" and interrupted it; I do
> not recall exactly how.
> The I tried to roll back.
>
> This seemed to be working, but the little progress bar on the bottom
> left of the workbench is stuck at "updating 200 / 534 files".
> There is a pink bar at the top of the display for "Ross" that says
> "abort: uncommitted changes".
> hg status in a terminal in the repo gives a long list of ! and ? files
> (there was a long list of such files before, I think, but some ar the
> files named in the "removing xxx" messages) but otherwise says nothing.
>
This is a minor issue and would be resolved by starting the GUI
> I went to the local repository, "Sunbelt" that matched the remote one
> and did a pull and then update. The pull seemed to work, but I think
> the update is blocked by the other update that is hung.
>
> I'm in a real mess and would appreciate some help.
>
> My goals are
> 1) restore the "Ross" project I incorrectly updated to its original form.
> If possible I'd even like to remove the changes I pulled.
> 2) integrate the changes into the right repository, "Sunbelt".
> 3) get the thg workbench unstuck.
>
> I'm also curious to know what's going on. In particular, is there any
> risk that files that weren't under version control in "Ross" have been
> deleted or changed?
>
it seems like the remote commits did some serious changes to the repo.
This ML is primarily for GUI issues, so you would get much more feedback
for problems like this from the Mercurial users ML or their IRC channel.
Cheers,
--
Steve Borho
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
