annotate tests/test-nested-repo.out @ 3071:547d1a4aa105

hg merge: fix lookup of branch add some tests for branch usage
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 08 Sep 2006 02:16:16 +0200
parents 74f70f2e08aa
children d316124ebbea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2061
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
1 # should print nothing
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
2 # should print ? b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
3 ? b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
4 # should print A b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
5 A b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6 # should forget b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7 forgetting b/x
5987c1eac2ce support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8 # should print nothing