file status during merge

Bela Babik teki321 at gmail.com
Tue Jul 24 20:56:08 CDT 2007


Hi,

why are the status of new files M instead of A when I am merging branches?

user at USER2K3 ~/hgtest/kicsi
$ hg status

user at USER2K3 ~/hgtest/kicsi
$ hg branch
head

user at USER2K3 ~/hgtest/kicsi
$ echo "salala" > ehehe

user at USER2K3 ~/hgtest/kicsi
$ hg branch newbranch
marked working directory as branch newbranch

user at USER2K3 ~/hgtest/kicsi
$ hg commit -A -m "add new file"
adding ehehe

user at USER2K3 ~/hgtest/kicsi
$ hg update -C -r head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved

user at USER2K3 ~/hgtest/kicsi
$ hg merge -r newbranch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

user at USER2K3 ~/hgtest/kicsi
$ hg status
M ehehe

-- 
teki


More information about the Mercurial mailing list