Mercurial > hg

view tests/test-up-local-change @ 509:98a2935c3d6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] replace history with log -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] replace history with log From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Merge hg history into hg log leaving the first as an alias (tweaked by mpm: update docs, tests, use existing alias mechanism) manifest hash: f85001a4373b8b823a6221ba5c506628059d6779 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSr1ywK+sNU5EO8RAmbAAJ9HlFkf8/qLOAQUtj8CWxGRPEyzVgCgtXwP SdnAg1a2q4693+TBiOjrimY= =w9rf -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 02:48:21 -0800
parents c5705ab9cebd
children 3d4d5f2aba9a 4fc63e22b1fe
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"

hg clone . ../r2
cd ../r2
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