Mercurial > hg
diff tests/test-newbranch.out @ 4209:dbc3846c09a1
Merge with -stable, fix small test failure
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Mar 2007 01:26:09 -0500 |
parents | aee3d312c32e a7af0eeae8a3 |
children | 0d51eb296fb9 |
line wrap: on
line diff
--- a/tests/test-newbranch.out Tue Mar 13 21:54:34 2007 -0700 +++ b/tests/test-newbranch.out Wed Mar 14 01:26:09 2007 -0500 @@ -45,10 +45,10 @@ summary: initial foo 5:5f8fb06e083e - 3:bf1bc2f45e83 +default 3:bf1bc2f45e83 bar 2:67ec16bde7f1 foo - +default bar % test for invalid branch cache rolling back last transaction @@ -76,26 +76,10 @@ 4:4909a3732169 - features: unnamed 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 -bf1bc2f45e834c75404d0ddab57d53beab56e2f8 +bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar -% test for different branch cache features -branch cache: no features specified -foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f - 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 -bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca -branch cache: unknown features: dummy, foo, bar -foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f - 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 -bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca -branch cache: missing features: unnamed -foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f - 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 -bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca -% test old hg reading branch cache with feature list -ValueError raised correctly, good. % update with no arguments: tipmost revision of the current branch bf1bc2f45e83 4909a3732169 (foo) tip