test-remove.out
118 lines
| 3.0 KiB
| text/plain
|
TextLexer
/ tests / test-remove.out
Dirkjan Ochtman
|
r6346 | % file not managed | ||
Benoit Boissinot
|
r8533 | not removing foo: file is untracked | ||
Dirkjan Ochtman
|
r6346 | ? foo | ||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 00 state added, options none | ||||
not removing bar: file has been marked for add (use -f to force removal) | ||||
A bar | ||||
Florent Guillaume
|
r6356 | ./bar | ||
./foo | ||||
Benoit Boissinot
|
r8518 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Dirkjan Ochtman
|
r6346 | % 01 state clean, options none | ||
R foo | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 02 state modified, options none | ||||
not removing foo: file is modified (use -f to force removal) | ||||
M foo | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 03 state missing, options none | ||||
R foo | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 10 state added, options -f | ||||
? bar | ||||
Florent Guillaume
|
r6356 | ./bar | ||
./foo | ||||
Dirkjan Ochtman
|
r6346 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 11 state clean, options -f | ||||
R foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% 12 state modified, options -f | ||||
R foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% 13 state missing, options -f | ||||
R foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% 20 state added, options -A | ||||
not removing bar: file still exists (use -f to force removal) | ||||
A bar | ||||
Florent Guillaume
|
r6356 | ./bar | ||
./foo | ||||
Benoit Boissinot
|
r8518 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Dirkjan Ochtman
|
r6346 | % 21 state clean, options -A | ||
not removing foo: file still exists (use -f to force removal) | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 22 state modified, options -A | ||||
not removing foo: file still exists (use -f to force removal) | ||||
M foo | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 23 state missing, options -A | ||||
R foo | ||||
Benoit Boissinot
|
r8518 | ? bar | ||
./bar | ||||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 30 state added, options -Af | ||||
? bar | ||||
Florent Guillaume
|
r6356 | ./bar | ||
./foo | ||||
Dirkjan Ochtman
|
r6346 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 31 state clean, options -Af | ||||
R foo | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 32 state modified, options -Af | ||||
R foo | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% 33 state missing, options -Af | ||||
R foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
adding test/bar | ||||
adding test/foo | ||||
% dir, options none | ||||
Matt Mackall
|
r6761 | removing test/bar | ||
Dirkjan Ochtman
|
r6346 | removing test/foo | ||
R test/bar | ||||
R test/foo | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% dir, options -f | ||||
Matt Mackall
|
r6761 | removing test/bar | ||
Dirkjan Ochtman
|
r6346 | removing test/foo | ||
R test/bar | ||||
R test/foo | ||||
Florent Guillaume
|
r6356 | ./foo | ||
Dirkjan Ochtman
|
r6346 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% dir, options -A | ||||
not removing test/foo: file still exists (use -f to force removal) | ||||
removing test/bar | ||||
R test/bar | ||||
Florent Guillaume
|
r6356 | ./foo | ||
./test/foo | ||||
Dirkjan Ochtman
|
r6346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% dir, options -Af | ||||
Matt Mackall
|
r6761 | removing test/bar | ||
Dirkjan Ochtman
|
r6346 | removing test/foo | ||
R test/bar | ||||
R test/foo | ||||
Florent Guillaume
|
r6356 | ./foo | ||
./test/foo | ||||
Dirkjan Ochtman
|
r6346 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Patrick Mezard
|
r9572 | test remove dropping empty trees (issue1861) | ||
adding issue1861/b/c/y | ||||
adding issue1861/x | ||||
removing issue1861/b/c/y | ||||
x | ||||