developing with bookmarks
Alexander Solovyov
alexander at solovyov.net
Thu Jan 20 06:57:26 CST 2011
Hi,
our company is switching to Mercurial (huh :), and we started using bookmarks to
track feature branches and trunk. But there is one issue which bugs me a bit:
if you have a branch (let's say it's marked with bookmark 'dev'),
which is strict
superset of main development branch ('trunk'), then you can't merge it in trunk,
because it's fully contained there. What you need to do is:
hg book -r dev -f trunk
This is quite ugly in my opinion, but I have no idea how that could be fixed.
Maybe merge should acquire some knowledge of bookmarks after bookmarks
moved to core?
--
Alexander
More information about the Mercurial-devel
mailing list