Merging multiple heads

[Niklas Rosencrantz]

On Thu, Oct 6, 2011 at 4:02 PM, Martin Geisler <mg at aragost.com> wrote:

> Niklas Rosencrantz <niklasro at gmail.com> writes:
>
> > On Thu, Oct 6, 2011 at 3:35 PM, Martin Geisler <mg at aragost.com> wrote:
> >
> >> Ehm, that can't be the problem when "hg status" is empty. You never
> >> confirmed that it is empty, just that it's empty for a subdirectory?
> >
> > As far as I see there are only ! and ? files and it displays from the
> > directory .. instead of .
> >
> > I attach the file with the output, the project directory is called
> > "montaoproject" and the other files from the .. directory are from other
> > projects.
> >
> > I see no relevant file from hg status at all. I consider making a new hg
> > clone, will that help?
>
> Files listed with a '?' are highly relevant for commit. They are files
> that have been deleted without telling Mercurial about it and they count
> as a modification.
>
> So you need to revert the files in question or you need to tell
> Mercurial about the deletion (see addremove for that) and commit it.
>
> --
> Martin Geisler
>
> aragost Trifork
> Professional Mercurial support
> http://mercurial.aragost.com/kick-start/
>
Thank you everybody for the help. I ran hg revert -a. Then merge was
allowed, I could commit, push and now it looks like a success story merging
roberto's commits and mine:

$ hg glog | more
@    changeset:   267:3b2bb6de33eb
|\   tag:         tip
| |  parent:      266:2bf5b62720fc
| |  parent:      265:ac5d3c3a03ac
| |  user:        niklasro
| |  date:        Thu Oct 06 16:06:21 2011 +0000
| |  summary:     merge
| |
| o  changeset:   266:2bf5b62720fc
| |  parent:      261:6acd1aaef950
| |  user:        niklasro
| |  date:        Thu Oct 06 12:48:20 2011 +0000
| |  summary:     added
| |
o |  changeset:   265:ac5d3c3a03ac
| |  user:        roberto.cr
| |  date:        Thu Oct 06 07:32:15 2011 +0000
| |  summary:     fixing "redirects" links
| |
o |  changeset:   264:2fd0bf24e90f
| |  user:        roberto.cr
| |  date:        Thu Oct 06 07:29:58 2011 +0000
| |  summary:     fixing "redirects" links
| |
o |  changeset:   263:29a373aae81e
| |  user:        roberto.cr
| |  date:        Thu Oct 06 07:25:05 2011 +0000
| |  summary:     fixing "redirects" links
| |
o |  changeset:   262:d75cd4d3e77a
| |  parent:      260:dfb54b99f84d
| |  user:        roberto.cr
| |  date:        Thu Oct 06 07:24:55 2011 +0000
| |  summary:     fixing "redirects" links
| |
| o  changeset:   261:6acd1aaef950
|/   user:        niklasro
|    date:        Thu Oct 06 07:53:19 2011 +0000
|    summary:     auth backend + js
|
o  changeset:   260:dfb54b99f84d
|  user:        niklasro
|  date:        Wed Oct 05 05:34:37 2011 +0000
|  summary:     FB buggfix example.html
|
o  changeset:   259:92fb6b1bc492
|  user:        niklasro
|  date:        Thu Sep 29 16:42:33 2011 +0000
|  summary:     changes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111006/28c3f82e/attachment-0002.html>