view tests/test-up-local-change @ 343:d7df759d0e97

rework all code using tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rework all code using tags Add three utility functions: tags(): get (and possibly load) the tags mapping tagslist(): sort tag,node by revision (aka topologically) nodetags(): return a list of tags associated with a node (also cached) Update all the code using tags to use these. Simplify identify code make unknown always visible if printed don't ignore tip pseudo-tag manifest hash: e6deb4d545ad465be7735f9ec43227bcb5e238c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+HjywK+sNU5EO8RAh4/AJ90cI0WxmvQAj6Lq2ZiG8LmqZan/QCfR8B5 ltu8tOIEHDa8LhfS9wtBu0k= =pv3t -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:08:03 -0800
parents 6c869059beb4
children b2293093b89e b4e0e20646bb
line wrap: on
line source

#!/bin/bash

export HGMERGE=true

set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"

cd ..
mkdir r2
cd r2
hg init ../r1
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d