tests/test-rawcommit1
author Vincent Danjean
Fri, 23 Sep 2005 18:59:16 -0700
changeset 1341 3ab6e55ee361
parent 1308 2073e5a71008
child 1933 7544700fd931
permissions -rwxr-xr-x
Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).

#!/bin/sh
hg --debug init
echo this is a1 > a
hg add a
hg commit -m0 -d "0 0"
echo this is b1 > b
hg add b
hg commit -m1 -d "0 0"
hg manifest 1
echo this is c1 > c
hg rawcommit -p 1 -d "0 0" -m2 c
hg manifest 2
hg parents
rm b
hg rawcommit -p 2 -d "0 0" -m3 b
hg manifest 3
hg parents
echo this is a22 > a
hg rawcommit -p 3 -d "0 0" -m4 a
hg manifest 4
hg parents
echo this is c22 > c
hg rawcommit -p 1 -d "0 0" -m5 c
hg manifest 5
hg parents
# merge, but no files changed
hg rawcommit -p 4 -p 5 -d "0 0" -m6
hg manifest 6
hg parents
# no changes what-so-ever
hg rawcommit -p 6 -d "0 0" -m7
hg manifest 7
hg parents