[ANN] hg4idea 0.4 released

New features in 0.4:
* Integrated IDEA Update with Mercurial, will do a pull and update of incoming changesets 
* Merge integrated with IDEA conflict resolver 
* Rebase patches, if you have any patches in your series, update will rebase them

Requirements:
* Mercurial 1.1, hg4idea uses new hg resolve command
* Mercurial rebase extension if you are using MQ

Also hg4idea home page moved to http://www.bitbucket.org/viacoban/hg4idea/overview/
They provide hosting for mercurial repositories (who tried mercurial is too spoiled to be comfortable with svn)

If you have any suggestions/bugs to report enter them here:
http://www.bitbucket.org/viacoban/hg4idea/issues/

Happy coding!

5 comments
Comment actions Permalink

I never can commit using 0.4.1 - always getting a "Commit failed with
errors". The commit on the command line works without problem.

Tom

0
Comment actions Permalink

Tom,

Hard to debug without additional details.
Are you using commit icon from vcs toolbar (Version Control -> Commit Changes) or Version Control -> Commit

What did you do before that? Any updates / merges?

Are your files resolved (hg resolve)

Also please check your path to repository root is correct in project vcs settings.

Were you using hg4idea before 0.4.1? Were you able to commit before?

Thanks

On 12/19/2008 07:41 AM, Tom wrote:

I never can commit using 0.4.1 - always getting a "Commit failed with
errors". The commit on the command line works without problem.

>

Tom


0
Comment actions Permalink

Hard to debug without additional details.
Are you using commit icon from vcs toolbar (Version Control -> Commit
Changes) or Version Control -> Commit


I've tried to commit from the Changes view.

What did you do before that? Any updates / merges?


Not from within IDEA.

Are your files resolved (hg resolve)


Most likely not, I never used that command.

Also please check your path to repository root is correct in project vcs
settings.


I've already uninstalled it and continue to use the command line.

Were you using hg4idea before 0.4.1? Were you able to commit before?


No.

Tom

0
Comment actions Permalink

Hey,

Let's try to debug this one, maybe someone else is having similar issues.

Before continuing make sure you have Mercurial 1.1, your comment re hg resolve makes me think you have pre 1.1 mercurial.
And you cannot do merges in mercurial 1.1 without using hg resolve.

Another cause might be this:
After a merge mercurial expects whole repo to be commited.
Commit dialog from changes view has a limitation that it always wants to include at least a file making impossible to commit repo after merge
I've added a separate commit action what commits repo (and you have to use this one after merge), but I guess it's confusing to have 2 commit actions.

Thanks for your help debugging this

0
Comment actions Permalink

Please try 0.4.2 it has better error messages when commit fails,
might give you a hint on what went wrong.

0

Please sign in to leave a comment.