mercurial - 如何创建新的提交方式？

Question

我正在研究论文，并存储一些变化。我没有看到我有多个头的错误，对此我感到困惑-我只有一个工作存储库，偶尔将其推送到bitbucket。这是发生了什么:

$ hg commit -m "Fixing up..."
abort: No such file or directory: /Users/me/Dropbox/thesis/thesis_tex/simple.pdf
$ hg commit -m "Adding in page headers"
created new head

...又一次提交，没有意识到创建新的头像是一个问题...

$ hg push
pushing to ssh://hg@bitbucket.org/...
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)

$ hg heads
changeset:   26:3823a395b1ce
tag:         tip
user:        me
date:        Fri Aug 26 09:39:45 2011 -0400
summary:     Adding...

changeset:   24:c7c6517d4281
user:        me
date:        Thu Aug 25 16:34:42 2011 -0400
summary:     Fixing up...

如何在不弄乱我的工作目录的情况下轻松摆脱另一头？为什么要创建第二个头像？将Mercurial存储库保存在Dropbox文件夹中是否有问题？

Answer 1

How can I easily get rid of the other head, without messing up my working directory?

将分支与 hg merge 合并。

Is there a problem with keeping mercurial repositories in dropbox folders?

这对我来说似乎是多余的，因为Dropbox会在您的文件上保留30天的历史记录。我会选择Hg + Bitbucket(或任何Mercurial托管)或Dropbox，但不能同时选择两者。

编辑:为什么不使用Mercurial和Dropbox？ Here's why.

Ben Hughes said it well:

By keeping your Mercurial repo on Dropbox you’re version controlling your version control system files. If you somehow manage to cause a conflict with files in your .hg directory, things could get messy. Recoverable, but messy.