Mercurial > hg
annotate tests/test-churn.out @ 9815:49efeed49c94
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
author | Christian Boos <cboos@bct-technology.com> |
---|---|
date | Mon, 09 Nov 2009 20:15:49 +0100 |
parents | 7d56b6ffef72 |
children | 717c35d55fb3 |
rev | line source |
---|---|
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % create test repository |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 adding a |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 adding b |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 adding c |
7870
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
5 % churn separate directories |
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
6 user1 1 *************************************************************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 % churn all |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 user3 3 *************************************************************** |
7870
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
9 user1 3 *************************************************************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 user2 2 ****************************************** |
7070
2627ef59195d
churn and stats commands merged
Alexander Solovyov <piranha@piranha.org.ua>
parents:
6348
diff
changeset
|
11 % churn up to rev 2 |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 user2 2 *************************************************************** |
9669
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
13 user1 1 ******************************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 % churn with aliases |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 alias3 3 ************************************************************** |
7870
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
16 alias1 3 ************************************************************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 user2 2 ***************************************** |
8254
f108e89400d8
churn: use .hgchurn in repo root as default map file
Martin Geisler <mg@lazybytes.net>
parents:
7870
diff
changeset
|
18 % churn with .hgchurn |
f108e89400d8
churn: use .hgchurn in repo root as default map file
Martin Geisler <mg@lazybytes.net>
parents:
7870
diff
changeset
|
19 alias3 3 ************************************************************** |
f108e89400d8
churn: use .hgchurn in repo root as default map file
Martin Geisler <mg@lazybytes.net>
parents:
7870
diff
changeset
|
20 alias1 3 ************************************************************** |
f108e89400d8
churn: use .hgchurn in repo root as default map file
Martin Geisler <mg@lazybytes.net>
parents:
7870
diff
changeset
|
21 user2 2 ***************************************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 % churn with column specifier |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 user3 3 *********************** |
7870
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
24 user1 3 *********************** |
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 user2 2 *************** |
7070
2627ef59195d
churn and stats commands merged
Alexander Solovyov <piranha@piranha.org.ua>
parents:
6348
diff
changeset
|
26 % churn by hour |
9669
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
27 06 1 ***************** |
7870
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
28 09 2 ********************************* |
7bcce39e8f07
Returns lines changed for paths specified as arguments correctly.
madhu@madhu
parents:
7070
diff
changeset
|
29 12 4 ****************************************************************** |
9669
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
30 13 1 ***************** |
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
31 % churn with separated added/removed lines |
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
32 user1 +3/-1 +++++++++++++++++++++++++++++++++++++++++-------------- |
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
33 user3 +3/-0 +++++++++++++++++++++++++++++++++++++++++ |
9b127e888640
churn: ability to display added/removed lines separately
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9388
diff
changeset
|
34 user2 +2/-0 +++++++++++++++++++++++++++ |
9670
7d56b6ffef72
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9669
diff
changeset
|
35 % changeset number churn |
7d56b6ffef72
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9669
diff
changeset
|
36 user1 4 *************************************************************** |
7d56b6ffef72
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9669
diff
changeset
|
37 user3 3 *********************************************** |
7d56b6ffef72
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9669
diff
changeset
|
38 user2 2 ******************************** |
9388
f7968bba2307
churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8254
diff
changeset
|
39 adding foo |
f7968bba2307
churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8254
diff
changeset
|
40 test 0 |