I don't know why I thought we'd already checked this, but -- 'hg st' will tell you which files have been modified in your local repository, and 'hg diff' will tell you exactly what changes have taken place
I'm not sure of the exact state of your repository at the moment, so this *might* display all changes from the pull as well, which wouldn't be particularly useful. Worth trying, though. Don't see you in #galaxyproject yet, sure it's working? On Jan 29, 2013, at 1:42 PM, "Waldron, Michael H" <mwald...@email.unc.edu> wrote: > The hg update --check command reports the following: > > $ hg update --check > abort: uncommitted local changes > > I just connected to the #galaxyproject IRC channel. > > > Mike Waldron > Systems Specialist > ITS - Research Computing Center > University of North Carolina at Chapel Hill > > > ________________________________________ > From: Dannon Baker [dannonba...@me.com] > Sent: Tuesday, January 29, 2013 1:37 PM > To: Waldron, Michael H > Cc: Paul Boddie; James Taylor; Greg Von Kuster; galaxy-...@bx.psu.edu > Subject: Re: [galaxy-dev] Error trying to add tools from tool shed respository > > So that's interesting. My best guess was that this was caused by swapping > from galaxy-dist to galaxy-central in the situation where galaxy-dist has had > changesets applied directly and then ported to galaxy-central out of order, > combined with your oder version of mercurial. That parent, however, would > have been before that happened. > > Anyway, at this point, does `hg update --check` actually work? > > And, lastly, If you want -- hop on IRC (irc.freenode.net #galaxyproject, > http://wiki.galaxyproject.org/Get%20Involved#IRC_Channel) and it might be > faster to iterate through what we need to do to get your repository back in > shape. > > > On Jan 29, 2013, at 1:32 PM, "Waldron, Michael H" <mwald...@email.unc.edu> > wrote: > >> Forgot to also include the hg parents output. >> >> $ hg parents >> changeset: 7986:12fcd068b12e >> user: Daniel Blankenberg <d...@bx.psu.edu> >> date: Thu Oct 18 11:22:12 2012 -0400 >> summary: Do not hide failed datasets with HideDatasetAction post job >> action. >> >> >> Mike Waldron >> Systems Specialist >> ITS - Research Computing Center >> University of North Carolina at Chapel Hill >> >> >> ________________________________________ >> From: Waldron, Michael H >> Sent: Tuesday, January 29, 2013 1:28 PM >> To: Paul Boddie; James Taylor >> Cc: Greg Von Kuster; galaxy-...@bx.psu.edu >> Subject: RE: [galaxy-dev] Error trying to add tools from tool shed >> respository >> >> As it turns out, it was fairly simple to install a newer hg version (2.4.2). >> >> So now running hg merger --preview and hg heads returns: >> >> $ hg merge --preview >> abort: branch 'default' has one head - please merge with an explicit rev >> (run 'hg heads' to see all heads) >> [galaxy@galaxy galaxy-dist]$ hg heads >> changeset: 8677:22788c1262a2 >> tag: tip >> user: jeremy goecks <jeremy.goe...@emory.edu> >> date: Mon Jan 28 16:36:02 2013 -0500 >> summary: Language improvements for tophat wrappers. >> >> Mike Waldron >> Systems Specialist >> ITS - Research Computing Center >> University of North Carolina at Chapel Hill >> >> >> ________________________________________ >> From: Paul Boddie [paul.bod...@biotek.uio.no] >> Sent: Tuesday, January 29, 2013 12:01 PM >> To: James Taylor >> Cc: Waldron, Michael H; Greg Von Kuster; galaxy-...@bx.psu.edu >> Subject: Re: [galaxy-dev] Error trying to add tools from tool shed >> respository >> >> On 29/01/13 17:33, James Taylor wrote: >>> Wasn't sure of the order, those are definitely after running the >>> update. Dannon's advice makes a good point, upgrading to the latest >>> mercurial should help. >> >> If upgrading Mercurial will involve introducing another detour, you >> could potentially check which version of the Galaxy code you're using >> now as defined by the "parent" revisions: >> >> hg parents >> >> This (or these in certain cases) might not be a repository "head" and >> thus won't appear in "hg heads". If you have the graphlog extension >> enabled, running the following might be informative as it should show >> you where you are (with a "@" symbol) in the code history: >> >> hg glog | more >> >> If you don't want to risk your working directory, you could first clone >> it to make something that you can then experiment with: >> >> hg clone . ../galaxy-dist-test >> >> Then, you'd move into this clone: >> >> cd ../galaxy-dist-test >> >> You might need to update to the version previously printed by "hg >> parents" above: >> >> hg update <revision> >> >> One might then assume that any desirable update would involve getting to >> the "tip", and so you could try a merge with that: >> >> hg merge tip >> >> If all of this works reasonably, you should be able to do the same merge >> on your real working directory (and can thus delete the test directory). >> The result of any merge will need to be committed: >> >> hg commit >> >> Anyway, these are just some thoughts. The crucial point is that you can >> clone the repository and then work with the clone, discarding it if your >> experiments go wrong. Doing this might be quicker than having to get a >> more recent Mercurial version installed. >> >> Paul >> >> ___________________________________________________________ >> Please keep all replies on the list by using "reply all" >> in your mail client. To manage your subscriptions to this >> and other Galaxy lists, please use the interface at: >> >> http://lists.bx.psu.edu/ > ___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at: http://lists.bx.psu.edu/
