annotate tests/test-conflict @ 360:10519e4cbd02
filelog: add metadata support
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
filelog: add metadata support
To add metadata, we add an escape sequence "\1\n" to indicate that
some key:value metadata pairs follow.
manifest hash: 9a019d50f8d389b2c16cb46f4eab62c136b70fd7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsJfFywK+sNU5EO8RAl1AAJ9BJPgDWnot5MUdPnzPiNxlyhG0rACfVo10
6q9fGaPUpf8mxefz7G8D0Z0=
=1BL6
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Wed, 15 Jun 2005 13:04:05 -0800 |
parents |
f69a5d2d4fe1 |
children |
ee4c80d294e5 |
rev |
line source |
346
|
1 #!/bin/bash
|
|
2
|
|
3 set -x
|
|
4 hg init
|
|
5 echo "nothing" > a
|
|
6 hg add a
|
|
7 hg commit -t ancestor -u test -d "0 0"
|
|
8 echo "something" > a
|
|
9 hg commit -t branch1 -u test -d "0 0"
|
|
10 hg co 0
|
|
11 echo "something else" > a
|
|
12 hg commit -t branch2 -u test -d "0 0"
|
|
13 export HGMERGE=merge
|
|
14 hg -d up -m 1
|
|
15 hg id
|
|
16 cat a | grep -v ">>>" | grep -v "<<<"
|
|
17 hg status
|