Terry Reedy tjreedy at udel.edu
Tue May 20 21:50:31 CEST 2014

• Previous message: [Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?
• Next message: [Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

On 5/19/2014 2:08 AM, Terry Reedy wrote:
> On 5/19/2014 1:31 AM, Raymond Hettinger wrote:

>> To get my repo back into a usable state, I ran "hg update --clean"

> py35% hg update --clean
> % hg update --clean
> abort: index 00changelog.i unknown format 2!

After exiting Workbench and rebooting, update --clean worked fine.

-- 
Terry Jan Reedy

---

• Previous message: [Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?
• Next message: [Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-Dev mailing list