summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@evo.keithp.com>2006-02-20 11:39:31 -0800
committerKeith Packard <keithp@evo.keithp.com>2006-02-20 11:39:31 -0800
commit1fbc5f1f95ecc8db2c9ff1197398b69106223068 (patch)
treead135cfcbb8a3cc1bc03be3269e7c3ab0cffaee4
parent2eca8062c9f88098a08a1a69c8cd5251c439fb7f (diff)
Allow revision 1.1.1.1 to be a branch ancestor tooHEADxlib-importedmaster
-rw-r--r--cvsps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cvsps.c b/cvsps.c
index 1e64e3c..0f9d194 100644
--- a/cvsps.c
+++ b/cvsps.c
@@ -2590,7 +2590,7 @@ static void determine_branch_ancestor(PatchSet * ps, PatchSet * head_ps)
/* HACK: we sometimes pretend to derive from the import branch.
* just don't do that. this is the easiest way to prevent...
*/
- d2 = (strcmp(rev->rev, "1.1.1.1") == 0) ? 0 : count_dots(rev->rev);
+ d2 = /*(strcmp(rev->rev, "1.1.1.1") == 0) ? 0 : */ count_dots(rev->rev);
if (d2 > d1)
head_ps->ancestor_branch = rev->branch;