So here's the idea I have for implementing a hybrid install method, it would
use a shell script/batch file that does something like the following;
hg clone hg-stable thg-installer
cd thg-installer
hg tag -lr tip HG
hg pull -f ../qct
hg tag -lr tip QCT
hg pull -f ../tortoisehg
hg tag -lr tip THG
hg update -C THG
hg --config ui.merge=internal:fail merge QCT
hg --config ui.merge=internal:local resolve setup.py
..
hg commit -m "merge qct head"
hg --config ui.merge=internal:fail merge HG
..
hg commit -m "merge hg head"
cd .hg
hg clone ../thg_install_mq patches
cd ..
hg qpush -a
The idea is that this batch file would merge the heads of the three repos,
keeping the appropriate versions of conflicting files. It would then apply
a new simplified patch queue to the new tip. We could remove the need for
many of the existing patches by checking in some of the patched files
directly into the THG repo (contrib/win32/Mercurial.ini, etc)
Any comments/improvements?
--
Steve
PS: In the end, I think we would still like the installer to be built
directly from setup.py, so this is just an interim solution to simplify
builds.
------------------------------------------------------------------------------
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
