- int i;
- struct revision *best = NULL;
-
- mark_reachable(rev1, 1);
- mark_reachable(rev2, 2);
- for (i = 0; i < nr_revs ;i++) {
- struct revision *rev = revs[i];
- if ((rev->flags & 3) != 3)
- continue;
- if (!best) {
- best = rev;
- continue;
+ struct commit_list *rev1list = NULL;
+ struct commit_list *rev2list = NULL;
+
+ commit_list_insert(rev1, &rev1list);
+ rev1->object.flags |= 0x1;
+ commit_list_insert(rev2, &rev2list);
+ rev2->object.flags |= 0x2;
+
+ parse_commit(rev1);
+ parse_commit(rev2);
+
+ while (rev1list || rev2list) {
+ struct commit *ret;
+ if (!rev1list) {
+ // process 2
+ ret = process_list(&rev2list, 0x2, 0x1);
+ } else if (!rev2list) {
+ // process 1
+ ret = process_list(&rev1list, 0x1, 0x2);
+ } else if (rev1list->item->date < rev2list->item->date) {
+ // process 2
+ ret = process_list(&rev2list, 0x2, 0x1);
+ } else {
+ // process 1
+ ret = process_list(&rev1list, 0x1, 0x2);
+ }
+ if (ret) {
+ free_commit_list(rev1list);
+ free_commit_list(rev2list);
+ return ret;