Skip to content

Rebase after Pull

Created originally on Bitbucket by peterkronenberg (Peter Kronenberg)

With TorgtoiseHg, I've always run with Rebase after Pull, so that if I have some committed but unpushed changes, it will rebase them. I tried setting Rebase after pull on the Team->Pull menu, but after pulling, I get the following:

branch 'unanet-10-2' has one head - please rebase to an explicit rev (run 'hg heads' to see all heads)

at com.vectrace.MercurialEclipse.commands.CommandJob.execute(CommandJob.java:227)

at com.vectrace.MercurialEclipse.commands.JavaHgCommandJob.execute(JavaHgCommandJob.java:78)

at com.vectrace.MercurialEclipse.commands.extensions.HgRebaseClient.rebase(HgRebaseClient.java:139)

at com.vectrace.MercurialEclipse.commands.extensions.HgRebaseClient.rebaseCurrentOnTip(HgRebaseClient.java:42)

at com.vectrace.MercurialEclipse.commands.HgPushPullClient.pull(HgPushPullClient.java:173)

at com.vectrace.MercurialEclipse.wizards.PullOperation.performPull(PullOperation.java:128)

at com.vectrace.MercurialEclipse.wizards.PullOperation.run(PullOperation.java:208)

at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:119)

Caused by: com.aragost.javahg.commands.ExecutionException: branch 'unanet-10-2' has one head - please rebase to an explicit rev (run 'hg heads' to see all heads)

at com.aragost.javahg.internals.AbstractCommand.handleReturnCode(AbstractCommand.java:387)

at com.aragost.javahg.internals.OutputChannelInputStream.findNextOutputChannelBlock(OutputChannelInputStream.java:173)

at com.aragost.javahg.internals.OutputChannelInputStream.<init>(OutputChannelInputStream.java:74)

at com.aragost.javahg.internals.Server.runCommand(Server.java:408)

at com.aragost.javahg.internals.AbstractCommand.launchStream(AbstractCommand.java:180)

at com.aragost.javahg.ext.rebase.RebaseCommand.execute(RebaseCommand.java:54)

at com.vectrace.MercurialEclipse.commands.extensions.HgRebaseClient$1.run(HgRebaseClient.java:127)

at com.vectrace.MercurialEclipse.commands.extensions.HgRebaseClient$1.run(HgRebaseClient.java:1)

at com.vectrace.MercurialEclipse.commands.JavaHgCommandJob.doRun(JavaHgCommandJob.java:43)

at com.vectrace.MercurialEclipse.commands.CommandJob.run(CommandJob.java:89)

at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information