13 lines
478 B
Text
13 lines
478 B
Text
--- cvsps.c.orig Thu May 26 05:39:40 2005
|
|
+++ cvsps.c Wed Jul 18 00:30:09 2012
|
|
@@ -2550,9 +2550,9 @@ static void determine_branch_ancestor(PatchSet * ps, P
|
|
|
|
for (next = ps->members.next; next != &ps->members; next = next->next)
|
|
{
|
|
+ int d1, d2;
|
|
PatchSetMember * psm = list_entry(next, PatchSetMember, link);
|
|
rev = psm->pre_rev;
|
|
- int d1, d2;
|
|
|
|
/* the reason this is at all complicated has to do with a
|
|
* branch off of a branch. it is possible (and indeed
|