view tests/test-branch.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents b28d3e0f9a8c
children
line wrap: on
line source

adding a
adding b
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
the --branches option is deprecated, please use 'hg branches' instead
changeset:   0:b544c4ac4389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

the --branch option is deprecated, please use 'hg branch' instead
Using head f4ac749470f2 for branch foo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   1:f4ac749470f2
tag:         foo
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

2 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding c
the --branch option is deprecated, please use 'hg branch' instead
Using head f4ac749470f2 for branch foo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
the --branches option is deprecated, please use 'hg branches' instead
changeset:   2:1505d56ee00e
tag:         tip
parent:      0:b544c4ac4389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0.0

changeset:   1:f4ac749470f2
tag:         foo
branch:      foo
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

2 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding d
the --branch option is deprecated, please use 'hg branch' instead
Using head f4ac749470f2 for branch foo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
the --branches option is deprecated, please use 'hg branches' instead
changeset:   3:53b72df12ae5
tag:         tip
parent:      0:b544c4ac4389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0.0

changeset:   1:f4ac749470f2
tag:         foo
branch:      foo
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1