[Bug 3970] New: .hg/graftstate is not remove when aborting a graft.

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3970

          Priority: normal
            Bug ID: 3970
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: .hg/graftstate is not remove when aborting a graft.
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: pierre-yves.david at logilab.fr
          Hardware: Macintosh
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

When a graft is aborted with `hg update -C .` the .hg/grafstate file is not
removed.

With the current stable branch (next stable release) we now prevent commit
while a graft is in progress.

Not removing this file leave Mercurial in a "graft in progress" state and
prevent further usage of the repo.

Repro scrip below


  $ hg init graft_bug
  $ cd graft_bug
  $ echo 'babar' > jungle
  $ hg add jungle
  $ hg ci -m 'add babar in jungle'
  $ echo 'celestine' >> jungle
  $ hg ci -m 'add celestine in jungle'
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo 'zephir' >> jungle
  $ hg ci -m 'add zephir in jungle'
  created new head
  $ hg graft 1
  grafting revision 1
  merging jungle
  warning: conflicts during merge.
  merging jungle incomplete! (edit conflicts, then use 'hg resolve --mark')
  abandon : unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  $ hg up -C .
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo 'cornelius' >> jungle
  $ hg ci -m 'add cornelius in jungle'
  abandon : cannot commit an interrupted graft operation
  (use "hg graft -c" to continue graft)

-- 
You are receiving this mail because:
You are on the CC list for the bug.