Mercurial > hg
view tests/test-issue672 @ 9789:79e749b26b2b
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 07 Nov 2009 23:38:01 +0100 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # 0-2-4 # \ \ \ # 1-3-5 # # rename in #1, content change in #4. hg init t cd t touch 1 touch 2 hg commit -Am init # 0 hg rename 1 1a hg commit -m rename # 1 hg co -C 0 echo unrelated >> 2 hg ci -m unrelated1 # 2 hg merge --debug 1 hg ci -m merge1 # 3 hg co -C 2 echo hello >> 1 hg ci -m unrelated2 # 4 hg co -C 3 hg merge -y --debug 4 hg co -C 4 hg merge -y --debug 3