On Sun, Jul 3, 2011 at 3:13 PM, Neal Becker <[email protected]> wrote: > On Sunday, July 03, 2011, Steve Borho wrote: >> On Sun, Jul 3, 2011 at 8:54 AM, Neal Becker <[email protected]> wrote: >> > Neal Becker wrote: >> >> Trying to use shelve, when I selected chunks and clicked on move chunks >> >> to right: >> >> >> >> {{{ >> >> #!python >> >> ** Mercurial version (1.9). TortoiseHg version (2.1) >> >> ** Command: >> >> ** CWD: /home/nbecker/hn-aci >> >> ** Extensions loaded: hgk, transplant >> >> ** Python version: 2.7.1 (r271:86832, Apr 12 2011, 16:15:16) [GCC 4.6.0 >> >> 20110331 (Red Hat 4.6.0-2)] >> >> ** Qt-4.7.1 PyQt-4.8.3 >> >> Traceback (most recent call last): >> >> File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/shelve.py", >> >> line 236, in moveChunksRight >> >> if self.browseb.mergeChunks(file, chunks): >> >> File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/chunks.py", >> >> line 335, in mergeChunks >> >> if ctx._ph.comments: >> >> AttributeError: 'patchctx' object has no attribute '_ph' >> >> >> >> }}} >> >> This should only be possible if the shelf patch file is broken or >> unreadable. > > I don't even see any shelf patch file (do you recall the name of the shelf > file?)
The shelve tool creates patches in .hg/shelves (and backups in .hg/Trashcan). But this appears to be a more general issue in that new patch generation is broken, at least on Linux. I'll fix this today; there will be a 2.1.1 release on Tuesday or Wednesday. -- Steve Borho ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
