file status during merge
Bela Babik
teki321 at gmail.com
Wed Jul 25 00:27:41 CDT 2007
> A indicates files that have are completely unknown to Mercurial. ehehe
> is not such a file, as Mercurial put it there.
This can be a bit confusing, but I guess I understand why.
During the merge both node is presented on identify, they will be the
parents of the new node:
$ hg identify
fc4e27b314f3+f441c5e7ce91+ (head) tip
And when I am doing a hg status, I guess It will check both nodes, and
the file will be found in one of them.
The problem is that I am merging one branch into an another one (but
merging them together from Mercurial point of view) and would like to
know what am I doing (adding files to the branch), but I can't get the
information just after or before the merge.
teki
More information about the Mercurial
mailing list