Mercurial > hg
annotate tests/test-churn @ 6375:cdc458b12f0f
update: better logic and messages for updates
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 24 Mar 2008 10:01:05 -0500 |
parents | f8feaa665319 |
children | 78a17b77c5e7 |
rev | line source |
---|---|
6348
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 echo "[extensions]" >> $HGRCPATH |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 echo "churn=" >> $HGRCPATH |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 echo % create test repository |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 hg init repo |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 cd repo |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 echo a > a |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 hg ci -Am adda -u user1 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 echo b >> a |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 echo b > b |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 hg ci -Am addb -u user2 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 echo c >> a |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 echo c >> b |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 echo c > c |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 hg ci -Am addc -u user3 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 echo % churn all |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 hg churn |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 echo % churn up to rev 1 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 hg churn -r :1 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 echo % churn with aliases |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 cat > ../aliases <<EOF |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 user1 alias1 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
26 user3 alias3 |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 EOF |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
28 hg churn --aliases ../aliases |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
29 echo % churn with column specifier |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 COLUMNS=40 hg churn |
f8feaa665319
Make churn an official extension
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 |