Mercurial > hg
view tests/test-newbranch.out @ 6456:db5324d3c257
Pager extension: switch it off if --debugger is set
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Thu, 03 Apr 2008 11:11:31 +0200 |
parents | 4b0c9c674707 |
children | 1fe6f365df2e |
line wrap: on
line source
marked working directory as branch foo foo marked working directory as branch bar % branch shadowing abort: a branch of the same name already exists (use --force to override) marked working directory as branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo created new head 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 (inactive) bar 2:67ec16bde7f1 (inactive) 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 invalidating branch cache (tip differs) 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 % push should update the branch cache % pushing just rev 0 be8523e69bf892e25817fc97187516b3c0804ae4 0 be8523e69bf892e25817fc97187516b3c0804ae4 default % pushing everything 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar % update with no arguments: tipmost revision of the current branch bf1bc2f45e83 4909a3732169 (foo) tip marked working directory as branch foobar abort: branch foobar not found % fastforward merge marked working directory as branch ff adding ff 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo changeset: 6:f0c74f92a385 branch: foo tag: tip parent: 4:4909a3732169 parent: 5:c420d2121b71 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Merge ff into foo a ff