Hei there,
in TortoiseHg 1.x on merges the commit dialog showed diffs to both
parents. Especially when developing two slightly different branches in
parallel this comes in very handy when merging from one branch to the
other, because you could always check what should was merged and change
before commiting in case it was not merged like you wanted. I really
miss this feature in TortoiseHg 2.x. Is it somehow hidden and I have to
check some settings or was it dropped for some reason?
Let me explain a little further, how the files look like:
branch a:
#include "sfr64.h"
void main( void ) {
int i;
while( 1 ) {
/* a lot of C code here */
}
}
branch b:
#include "sfr65.h"
void main( void ) {
int i;
while( 1 ) {
/* a lot of the same C code as in branch a here */
}
}
Say I developed some things in the main routine of branch b and want to
merge this back to branch a, I only want this changes merged but not the
different lines like the first one with the include directive I showed
above. With the diff view to both parents I would at once spot this line
should not be merged to the other branch, I would open my editor, fix it
and eventually commit. With only one diff view it happend to me several
times now to overlook these cases ending up in branches which do not
compile successfully.
If there's no diff to both parents view in TortoiseHg 2.x anymore, what
would be a recommendable work flow for my case?
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
