Mercurial > hg
view 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 source
foo % branch shadowing abort: a branch of the same name already exists (use --force to override) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo changeset: 5:5f8fb06e083e branch: foo tag: tip parent: 4:4909a3732169 parent: 3:bf1bc2f45e83 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: merge changeset: 4:4909a3732169 branch: foo parent: 1:b699b1cec9c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: modify a branch changeset: 3:bf1bc2f45e83 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: clear branch name changeset: 2:67ec16bde7f1 branch: bar user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: change branch name changeset: 1:b699b1cec9c2 branch: foo user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add branch name changeset: 0:be8523e69bf8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: initial foo 5:5f8fb06e083e default 3:bf1bc2f45e83 bar 2:67ec16bde7f1 foo default bar % test for invalid branch cache rolling back last transaction changeset: 4:4909a3732169 branch: foo tag: tip parent: 1:b699b1cec9c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: modify a branch Invalid branch cache: unknown tip changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f branch: foo tag: tip parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 parent: -1:0000000000000000000000000000000000000000 manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a user: test date: Mon Jan 12 13:46:40 1970 +0000 files: a extra: branch=foo description: modify a branch 4:4909a3732169 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar % update with no arguments: tipmost revision of the current branch bf1bc2f45e83 4909a3732169 (foo) tip