annotate tests/test-conflict @ 469:e205194ca7ef
Various node id lookup tweaks
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Various node id lookup tweaks
- - lookup of nullid with lazymap fixed
- - do the Pythonic thing with negative rev numbers (-1 == tip)
- - bound ranges on rev numbers
- - catch exceptions more correctly
- - restrict node id matching to beginning of string on
manifest hash: 15918cb74f41ac4bbf8bf02bc3bb599f24f0b5b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQzDywK+sNU5EO8RAnKfAJ4vzXnrGmRwOlPqNQFxxrUKchzAzQCcDkbi
g3T3KiiVUckrWpziGq67YUE=
=vrSU
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Fri, 24 Jun 2005 23:50:27 -0800 |
parents |
ee4c80d294e5 |
children |
3d4d5f2aba9a 4fc63e22b1fe |
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
|
392
|
16 grep -Ev ">>>|<<<" a
|
346
|
17 hg status
|