##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r6160:3ee3bc5d default
r6385:0d4e068e default
Show More
test-newbranch
76 lines | 1.3 KiB | text/plain | TextLexer
Matt Mackall
Add some basic branch name tests
r3420 #!/bin/sh
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 branchcache=.hg/branch.cache
Matt Mackall
Add some basic branch name tests
r3420 hg init t
cd t
Matt Mackall
add branch and branches commands
r3502 hg branches
Matt Mackall
Add some basic branch name tests
r3420
echo foo > a
hg add a
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "initial" -d "1000000 0"
Matt Mackall
add branch and branches commands
r3502 hg branch foo
hg branch
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "add branch name" -d "1000000 0"
Matt Mackall
add branch and branches commands
r3502 hg branch bar
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "change branch name" -d "1000000 0"
Brendan Cully
Add test for branch shadowing
r4203 echo % branch shadowing
Matt Mackall
Move branch read/write to dirstate where it belongs
r4179 hg branch default
Matt Mackall
Merge with -stable, fix small test failure
r4209 hg branch -f default
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "clear branch name" -d "1000000 0"
Matt Mackall
Add some basic branch name tests
r3420
hg co foo
Matt Mackall
add branch and branches commands
r3502 hg branch
Matt Mackall
Add some basic branch name tests
r3420 echo bleah > a
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "modify a branch" -d "1000000 0"
Matt Mackall
Add some basic branch name tests
r3420
hg merge
Matt Mackall
add branch and branches commands
r3502 hg branch
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg ci -m "merge" -d "1000000 0"
Matt Mackall
Add some basic branch name tests
r3420 hg log
Matt Mackall
add branch and branches commands
r3502 hg branches
hg branches -q
Thomas Arendsen Hein
Add test for invalid branch cache (fixed by 27ebe4efe98e)
r3451 echo % test for invalid branch cache
hg rollback
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 cp $branchcache .hg/bc-invalid
Alexis S. L. Carvalho
small fixes for test-newbranch...
r3760 hg log -r foo
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 cp .hg/bc-invalid $branchcache
Alexis S. L. Carvalho
Ignore all errors while parsing the branch cache.
r3761 hg --debug log -r foo
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 rm $branchcache
echo corrupted > $branchcache
Alexis S. L. Carvalho
Ignore all errors while parsing the branch cache.
r3761 hg log -qr foo
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 cat $branchcache
Brendan Cully
Test update to branch tip
r4175
Alexis S. L. Carvalho
update the branch cache at the end of addchangegroup...
r5988 echo % push should update the branch cache
hg init ../target
echo % pushing just rev 0
hg push -qr 0 ../target
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 cat ../target/$branchcache
Alexis S. L. Carvalho
update the branch cache at the end of addchangegroup...
r5988 echo % pushing everything
hg push -qf ../target
Alexis S. L. Carvalho
tests: hide the name of the branch cache file
r6160 cat ../target/$branchcache
Alexis S. L. Carvalho
update the branch cache at the end of addchangegroup...
r5988
Brendan Cully
Test update to branch tip
r4175 echo % update with no arguments: tipmost revision of the current branch
hg up -q -C 0
hg up -q
hg id
hg up -q 1
hg up -q
hg id
Alexis S. L. Carvalho
avoid a traceback with hg branch newbranch; hg up
r4231 hg branch foobar
hg up
Brendan Cully
Add fast-forward branch merging
r4410 echo % fastforward merge
hg branch ff
echo ff > ff
hg ci -Am'fast forward' -d '1000000 0'
hg up foo
hg merge ff
hg branch
hg commit -m'Merge ff into foo' -d '1000000 0'
hg parents
hg manifest
Alexis S. L. Carvalho
avoid a traceback with hg branch newbranch; hg up
r4231 exit 0