Mercurial > hg
view tests/test-push-hook-lock @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 876e4e6ad82b |
children |
line wrap: on
line source
#!/bin/sh hg init 1 echo '[ui]' >> 1/.hg/hgrc echo 'timeout = 10' >> 1/.hg/hgrc echo foo > 1/foo hg --cwd 1 ci -A -m foo hg clone 1 2 hg clone 2 3 echo '[hooks]' >> 2/.hg/hgrc echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc echo bar >> 3/foo hg --cwd 3 ci -m bar hg --cwd 3 push ../2