Merging multiple heads

Martin Geisler mg at lazybytes.net
Thu Oct 6 20:36:17 UTC 2011


Matt Mackall <mpm at selenic.com> writes:

> On Thu, 2011-10-06 at 18:02 +0200, Martin Geisler 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.
>
> I think you mean files marked '!'.

Yes, of course :)

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111006/6f834374/attachment.asc>


More information about the Mercurial mailing list