sapling/tests/test-newbranch.out

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
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
Fix up tests for new branch message 2007-06-18 22:13:16 +04:00			`marked working directory as branch foo`
add branch and branches commands 2006-10-25 01:49:36 +04:00			`foo`
Fix up tests for new branch message 2007-06-18 22:13:16 +04:00			`marked working directory as branch bar`
Add test for branch shadowing 2007-03-13 00:50:19 +03:00			`% branch shadowing`
			`abort: a branch of the same name already exists (use --force to override)`
Fix up tests for new branch message 2007-06-18 22:13:16 +04:00			`marked working directory as branch default`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`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`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 5:5f8fb06e083e`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`branch: foo`
			`tag: tip`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`parent: 4:4909a3732169`
			`parent: 3:bf1bc2f45e83`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: merge`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 4:4909a3732169`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`branch: foo`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`parent: 1:b699b1cec9c2`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: modify a branch`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 3:bf1bc2f45e83`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: clear branch name`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 2:67ec16bde7f1`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`branch: bar`
			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: change branch name`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 1:b699b1cec9c2`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`branch: foo`
			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: add branch name`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 0:be8523e69bf8`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add some basic branch name tests 2006-10-18 03:48:41 +04:00			`summary: initial`

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`foo 5:5f8fb06e083e`
Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 21:40:09 +04:00			`default 3:bf1bc2f45e83 (inactive)`
			`bar 2:67ec16bde7f1 (inactive)`
add branch and branches commands 2006-10-25 01:49:36 +04:00			`foo`
"default" is the default branch name 2007-03-13 21:02:33 +03:00			`default`
add branch and branches commands 2006-10-25 01:49:36 +04:00			`bar`
Add test for invalid branch cache (fixed by 7f2cd09b4f33) 2006-10-18 12:35:14 +04:00			`% test for invalid branch cache`
			`rolling back last transaction`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`changeset: 4:4909a3732169`
Add test for invalid branch cache (fixed by 7f2cd09b4f33) 2006-10-18 12:35:14 +04:00			`branch: foo`
			`tag: tip`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`parent: 1:b699b1cec9c2`
Add test for invalid branch cache (fixed by 7f2cd09b4f33) 2006-10-18 12:35:14 +04:00			`user: test`
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0" 2006-12-02 08:16:17 +03:00			`date: Mon Jan 12 13:46:40 1970 +0000`
Add test for invalid branch cache (fixed by 7f2cd09b4f33) 2006-10-18 12:35:14 +04:00			`summary: modify a branch`

Print less scary warning when invalidating the branch cache. 2008-02-09 20:58:31 +03:00			`invalidating branch cache (tip differs)`
Ignore all errors while parsing the branch cache. 2006-12-02 08:38:55 +03:00			`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`
"default" is the default branch name 2007-03-13 21:02:33 +03:00			`bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default`
Ignore all errors while parsing the branch cache. 2006-12-02 08:38:55 +03:00			`4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo`
			`67ec16bde7f1575d523313b9bca000f6a6f12dca bar`
update the branch cache at the end of addchangegroup This should avoid a bad performance problem when the branch cache is not up-to-date, and hgweb can't write an updated version because it lacks permissions. 2008-02-04 02:03:46 +03:00			`% push should update the branch cache`
			`% pushing just rev 0`
			`be8523e69bf892e25817fc97187516b3c0804ae4 0`
			`be8523e69bf892e25817fc97187516b3c0804ae4 default`
			`% pushing everything`
			`4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4`
			`bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default`
			`4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo`
			`67ec16bde7f1575d523313b9bca000f6a6f12dca bar`
Test update to branch tip 2007-03-11 04:36:29 +03:00			`% update with no arguments: tipmost revision of the current branch`
			`bf1bc2f45e83`
			`4909a3732169 (foo) tip`
Fix up tests for new branch message 2007-06-18 22:13:16 +04:00			`marked working directory as branch foobar`
avoid a traceback with hg branch newbranch; hg up 2007-03-16 06:22:59 +03:00			`abort: branch foobar not found`
Add fast-forward branch merging 2007-05-07 07:27:45 +04:00			`% fastforward merge`
Fix up tests for new branch message 2007-06-18 22:13:16 +04:00			`marked working directory as branch ff`
Add fast-forward branch merging 2007-05-07 07:27:45 +04:00			`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`
Make fast-forward merges full merges 2007-06-18 23:38:54 +04:00			`changeset: 6:f0c74f92a385`
Add fast-forward branch merging 2007-05-07 07:27:45 +04:00			`branch: foo`
			`tag: tip`
Make fast-forward merges full merges 2007-06-18 23:38:54 +04:00			`parent: 4:4909a3732169`
			`parent: 5:c420d2121b71`
Add fast-forward branch merging 2007-05-07 07:27:45 +04:00			`user: test`
			`date: Mon Jan 12 13:46:40 1970 +0000`
			`summary: Merge ff into foo`

			`a`
			`ff`