| author | Thomas Arendsen Hein <thomas@intevation.de> |
| Sun, 16 Mar 2008 23:24:53 +0100 | |
| changeset 6287 | c86207d41512 |
| parent 6256 | 69c75d063c7a |
| child 6336 | 4b0c9c674707 |
| permissions | -rw-r--r-- |
|
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
% 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
|
2 |
abort: outstanding uncommitted changes |
|
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
resolving manifests |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
removing a |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
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
|
6 |
(branch merge, don't forget to commit) |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 |
% should show a as removed |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 |
R a |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
% manifest. should not have a: |
|
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
b |