##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: handle directory renames...
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
Matt Mackall - - Load All Authors

File last commit:

r3502:8dc14d63 default
r3733:9e67fecb default
Show More
test-newbranch
33 lines | 477 B | text/plain | TextLexer
/ tests / test-newbranch
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init t
cd t
hg branches
echo foo > a
hg add a
hg ci -m "initial" -d "0 0"
hg branch foo
hg branch
hg ci -m "add branch name" -d "0 0"
hg branch bar
hg ci -m "change branch name" -d "0 0"
hg branch ""
hg ci -m "clear branch name" -d "0 0"
hg co foo
hg branch
echo bleah > a
hg ci -m "modify a branch" -d "0 0"
hg merge
hg branch
HG_MERGE=true hg ci -m "merge" -d "0 0"
hg log
hg branches
hg branches -q
echo % test for invalid branch cache
hg rollback
hg tip