[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Selective merges
From: |
Christopher.Fouts |
Subject: |
Selective merges |
Date: |
Tue, 25 May 2004 10:23:20 -0400 |
Can CVS or tkCVS select which diff's to merge between two files on
two different branches? IOW
file.cpp on branchX
for (i=0; i<10; i++) {
foo(i);
bar(i);
}
file.cpp on branchY
for (i=0; i<10; i++) {
foo(i);
bar(i);
foobar(i);
barfoo(i);
}
I want to be able to merge the foobar(i) statement from branchY
to branchX, but NOT the barfoo(i) statement...
-chris
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Selective merges,
Christopher.Fouts <=