Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch.out @ 3733:9e67fecbfd16
merge: handle directory renames
commit: handle new copy dirstate case correctly
findcopies:
keep a map of all copies found for directory logic
add dirs filter
check for merge:followdirs config option
generate a directory move map
find files that match directory move map
manifestmerge:
add directory rename cases
applyupdates:
skip actions with None file
add "d" action
recordupdates:
add "d" action
add simple directory rename test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 17:36:33 -0600 |
parents | 8dc14d630b29 |
children | aeafd80c1e78 |
line wrap: on
line source
foo 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:dc140083783b branch: foo tag: tip parent: 4:98d14f698afe parent: 3:9d567d0b51f9 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: merge changeset: 4:98d14f698afe branch: foo parent: 1:0079f24813e2 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify a branch changeset: 3:9d567d0b51f9 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: clear branch name changeset: 2:ed2bbf4e0102 branch: bar user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change branch name changeset: 1:0079f24813e2 branch: foo user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add branch name changeset: 0:db01e8ea3388 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: initial foo 5:dc140083783b bar 2:ed2bbf4e0102 foo bar % test for invalid branch cache rolling back last transaction changeset: 4:98d14f698afe branch: foo tag: tip parent: 1:0079f24813e2 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify a branch