trouble with fast forward merge
Bela Babik
teki321 at gmail.com
Wed Jul 4 20:33:42 CDT 2007
Hi,
the new fast forward merge is really handful, but means
that I can merge as many times as I try and will
not recognise that I am just creating new empty nodes.
It would be nice if it could be turned off by default
and turned on by a flag.
$ hg branch
w2
$ hg merge head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
$ hg commit -m"merge head2"
$ hg merge head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m"merge head3"
$ hg log -l 2 -v
changeset: 9:bfb23add63c2
branch: w2
tag: tip
parent: 8:f83317f391fa
parent: 4:8456d7466381
user: user at company.au
date: Thu Jul 05 11:25:25 2007 +1000
description:
merge head3
changeset: 8:f83317f391fa
branch: w2
parent: 7:f3ee28d76544
parent: 4:8456d7466381
user: user at company.au
date: Thu Jul 05 11:25:16 2007 +1000
description:
merge head2
--
teki
eng: http://tekidev.blogspot.com/
hun: http://repcsi.hu/ | http://repcsi.hu/teki/
More information about the Mercurial
mailing list