1 /*
2 * Copyright (C) 2014, Sven Selberg <sven.selberg@sonymobile.com>
3 * and other copyright owners as documented in the project's IP log.
4 *
5 * This program and the accompanying materials are made available
6 * under the terms of the Eclipse Distribution License v1.0 which
7 * accompanies this distribution, is reproduced below, and is
8 * available at http://www.eclipse.org/org/documents/edl-v10.php
9 *
10 * All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or
13 * without modification, are permitted provided that the following
14 * conditions are met:
15 *
16 * - Redistributions of source code must retain the above copyright
17 * notice, this list of conditions and the following disclaimer.
18 *
19 * - Redistributions in binary form must reproduce the above
20 * copyright notice, this list of conditions and the following
21 * disclaimer in the documentation and/or other materials provided
22 * with the distribution.
23 *
24 * - Neither the name of the Eclipse Foundation, Inc. nor the
25 * names of its contributors may be used to endorse or promote
26 * products derived from this software without specific prior
27 * written permission.
28 *
29 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
30 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
31 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
32 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
33 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
34 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
35 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
36 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
37 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
38 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
39 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
40 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
41 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42 */
43 package org.eclipse.jgit.revwalk;
44
45 import static org.junit.Assert.assertTrue;
46
47 import org.junit.Test;
48
49 public class RevWalkMergedIntoTest extends RevWalkTestCase {
50
51 @Test
52 public void testOldCommitWalk() throws Exception {
53 /*
54 * Sometimes a merge is performed on a machine with faulty time.
55 * This makes the traversal of the graph, when trying to find out if B
56 * is merged into T, complex since the algorithm uses the time stamps
57 * of commits to find the best route.
58 * When for example O(ld) has a very old time stamp compared to one of the
59 * commits (N(ew)) on the upper route between T and F(alse base), the route
60 * to False is deemed the better option even though the alternate route leeds
61 * to B(ase) which was the commit we were after.
62 *
63 * o---o---o---o---N
64 * / \
65 * / o---o---o---O---T
66 * / /
67 * ---F---B
68 *
69 * This test is asserting that isMergedInto(B, T) returns true even
70 * under those circumstances.
71 */
72 final int threeDaysInSecs = 3 * 24 * 60 * 60;
73 final RevCommit f = commit();
74 final RevCommit b = commit(f);
75 final RevCommit o = commit(-threeDaysInSecs, commit(commit(commit(b))));
76 final RevCommit n = commit(commit(commit(commit(commit(f)))));
77 final RevCommit t = commit(n, o);
78 assertTrue(rw.isMergedInto(b, t));
79 }
80 }