equal
deleted
inserted
replaced
4 > allow_push = * |
4 > allow_push = * |
5 > [phases] |
5 > [phases] |
6 > publish=False |
6 > publish=False |
7 > [obsolete] |
7 > [obsolete] |
8 > secret-unstable=no |
8 > secret-unstable=no |
|
9 > [alias] |
|
10 > odiff=diff --rev 'limit(obsparents(.),1)' --rev . |
9 > [extensions] |
11 > [extensions] |
10 > EOF |
12 > EOF |
11 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
13 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
12 $ mkcommit() { |
14 $ mkcommit() { |
13 > echo "$1" > "$1" |
15 > echo "$1" > "$1" |
49 - 1f0dee641bb7 |
51 - 1f0dee641bb7 |
50 $ qlog -r 'obsolete()' --hidden |
52 $ qlog -r 'obsolete()' --hidden |
51 2 |
53 2 |
52 - 4538525df7e2 |
54 - 4538525df7e2 |
53 |
55 |
|
56 Test that obsolete parent a properly computed |
|
57 |
|
58 $ qlog -r 'obsparents(.)' --hidden |
|
59 2 |
|
60 - 4538525df7e2 |
|
61 $ qlog -r . |
|
62 3 |
|
63 - 0d3f46688ccc |
|
64 $ hg odiff |
|
65 diff -r 4538525df7e2 -r 0d3f46688ccc c |
|
66 --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
67 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
68 @@ -1,1 +0,0 @@ |
|
69 -c |
|
70 diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c |
|
71 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
72 +++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000 |
|
73 @@ -0,0 +1,1 @@ |
|
74 +obsol_c |
|
75 |
54 test obsolete changeset with no-obsolete descendant |
76 test obsolete changeset with no-obsolete descendant |
55 $ hg up 1 -q |
77 $ hg up 1 -q |
56 $ mkcommit "obsol_c'" # 4 (on 1) |
78 $ mkcommit "obsol_c'" # 4 (on 1) |
57 created new head |
79 created new head |
58 $ hg debugobsolete 4 3 |
80 $ hg debugobsolete 4 3 |