These commands seem to get us most of the way there (assumes you are in a
directory with hg-stable, tortoisehg-dev, and qct):
hg clone hg-stable thginstall
cd thginstall
hg tag -lr tip HG
hg pull -f ../tortoisehg-dev
hg update -C tip
hg --config ui.merge=internal:fail merge HG
hg resolve -m .hgignore .hgtags
hg --config ui.merge=internal:other resolve setup.py
hg commit -m "Merge HG"
hg pull -f ../qct
hg --config ui.merge=internal:local merge tip
hg commit -m "Merge QCT"
When we decide to unbundle qct, we can drop the last 3 lines from this batch
file
--
Steve
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
