Mercurial > hg
annotate tests/test-casefolding.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 03916abdfb64 |
children |
rev | line source |
---|---|
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % test file addition with bad case |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 adding a |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 A a |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 a |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 % test case collision on rename (issue 750) |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 adding a |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 a |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
8 committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 A: not overwriting - file exists |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 % test case collision between revisions (issue 912) |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 adding a |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 adding A |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |