| author | Matt Mackall <mpm@selenic.com> |
| Wed, 22 Oct 2008 17:34:52 -0500 | |
| changeset 7216 | 292fb2ad2846 |
| parent 6336 | 4b0c9c674707 |
| child 8545 | 3682a19bb637 |
| permissions | -rw-r--r-- |
|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6256
diff
changeset
|
1 |
created new head |
|
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
% local deleted a file, remote removed |
|
6256
69c75d063c7a
merge: require --force when there are deleted files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6255
diff
changeset
|
3 |
abort: outstanding uncommitted changes |
|
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
resolving manifests |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
removing a |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 |
(branch merge, don't forget to commit) |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 |
% should show a as removed |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
R a |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
% manifest. should not have a: |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
b |