Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-lock-badness @ 2548:0229ff95faec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents ff5c9a92f556
children c0b449154a90
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2016
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
1 #!/bin/sh
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
2
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
3 hg init a
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
4 echo a > a/a
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
5 hg --cwd a ci -A -m a
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6 hg clone a b
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7 echo b > b/b
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8 hg --cwd b ci -A -m b
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
9 chmod 100 a/.hg
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10 hg --cwd b push ../a
ff5c9a92f556 fix backtrace printed when cannot get lock.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
11 chmod 700 a/.hg