[issue746] trackback in mv after merge and mv

Henryk Gerlach mercurial-bugs at selenic.com
Wed Sep 19 01:55:57 CDT 2007


New submission from Henryk Gerlach <hgerlach at gmx.de>:

hg version
#Mercurial Distributed SCM (version 5b0b0834419c)
#or Mercurial Distributed SCM (version 0.9.4)
hg init a
cd a
echo a > a
hg add a
hg commit -m a

cd ..
hg clone a fork
#1 files updated, 0 files merged, 0 files removed, 0 files unresolved


cd fork
echo b > b
hg add b
hg commit -m b


cd ../a
echo aa > a
hg commit -m "really forked"
hg pull ../fork
#pulling from ../fork
#searching for changes
#adding changesets
#adding manifests
#adding file changes
#added 1 changesets with 1 changes to 1 files (+1 heads)
#(run 'hg heads' to see heads, 'hg merge' to merge)
hg merge
#1 files updated, 0 files merged, 0 files removed, 0 files unresolved
#(branch merge, don't forget to commit)
hg mv b c
hg mv c b
#** unknown exception encountered, details follow
#** report bug details to http://www.selenic.com/mercurial/bts
#** or mercurial at selenic.com
#** Mercurial Distributed SCM (version 0.9.4)

----------
messages: 4018
nosy: HenrykGerlach
priority: bug
status: unread
title: trackback in mv after merge and mv
topic: merge

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue746>
____________________________________________________



More information about the Mercurial-devel mailing list