annotate tests/test-merge3.out @ 810:790a0ff306f2

Move commands.forget over to using new walk code. With no names, it now recursively forgets everything, as is the default behaviour of other commands. And prints the names of all files it hasn't specifically been told to forget.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 29 Jul 2005 08:49:01 -0800
parents 122449dd89db
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
1 + hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2 + echo This is file a1
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
3 + hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 402
diff changeset
4 + hg commit -m 'commit #0' -d '0 0'
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
5 + touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 + hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 + rm b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 402
diff changeset
8 + hg commit -A '-mcomment #1' -d '0 0'
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
9 adding .out
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
10 removing b
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
11 b never committed!