From mercurial-bounces@selenic.com Thu Sep 1 07:01:32 2005 Return-Path: <mercurial-bounces@selenic.com> X-Original-To: bos@serpentine.com Delivered-To: bos@serpentine.com Received: from waste.org (waste.org [216.27.176.166]) by demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for <bos@serpentine.com>; Thu, 1 Sep 2005 07:01:32 -0700 (PDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005 08:59:51 -0500 Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com [68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id j81DxnNA028824 for <mercurial@selenic.com>; Thu, 1 Sep 2005 08:59:49 -0500 Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE= ; Message-ID: <20050901135917.25856.qmail@web32904.mail.mud.yahoo.com> Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu, 01 Sep 2005 06:59:17 PDT Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT) From: TK Soh <teekaysoh@yahoo.com> To: mercurial@selenic.com In-Reply-To: <20050828075808.GO27787@waste.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 X-Virus-Scanned: by amavisd-new Subject: Re: add -p to hg tip X-BeenThere: mercurial@selenic.com X-Mailman-Version: 2.1.5 Precedence: list List-Id: mercurial.selenic.com List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=unsubscribe> List-Archive: <http://www.selenic.com/pipermail/mercurial> List-Post: <mailto:mercurial@selenic.com> List-Help: <mailto:mercurial-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=subscribe> Sender: mercurial-bounces@selenic.com Errors-To: mercurial-bounces@selenic.com X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on demesne.serpentine.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.4 X-Evolution-Source: imap://bos@www.serpentine.com/ Content-Transfer-Encoding: 8bit

     1

#!/bin/sh

     2

     3

# This test makes sure that we don't mark a file as merged with its ancestor

     4

# when we do a merge.

     5

     6

cat <<'EOF' > merge

     7

#!/bin/sh

     8

echo merging for `basename $1`

     9

EOF

    10

chmod +x merge

    11

    12

echo creating base

    13

hg init a

    14

cd a

    15

echo 1 > foo

    16

echo 1 > bar

    17

echo 1 > baz

    18

echo 1 > quux

    19

hg add foo bar baz quux

    20

hg commit -m "base" -d "0 0"

    21

    22

cd ..

    23

hg clone a b

    24

    25

echo creating branch a

    26

cd a

    27

echo 2a > foo

    28

echo 2a > bar

    29

hg commit -m "branch a" -d "0 0"

    30

    31

echo creating branch b

    32

    33

cd ..

    34

cd b

    35

echo 2b > foo

    36

echo 2b > baz

    37

hg commit -m "branch b" -d "0 0"

    38

    39

echo "we shouldn't have anything but n state here"

    40

hg debugstate | cut -b 1-16,35-

    41

    42

echo merging

    43

hg pull ../a

    44

env HGMERGE=../merge hg update -vm

    45

    46

echo 2m > foo

    47

echo 2b > baz

    48

echo new > quux

    49

    50

echo "we shouldn't have anything but foo in merge state here"

    51

hg debugstate | cut -b 1-16,35- | grep "^m"

    52

    53

hg ci -m "merge" -d "0 0"

    54

    55

echo "main: we should have a merge here"

    56

hg debugindex .hg/00changelog.i

    57

    58

echo "log should show foo and quux changed"

    59

hg log -v -r tip

    60

    61

echo "foo: we should have a merge here"

    62

hg debugindex .hg/data/foo.i

    63

    64

echo "bar: we shouldn't have a merge here"

    65

hg debugindex .hg/data/bar.i

    66

    67

echo "baz: we shouldn't have a merge here"

    68

hg debugindex .hg/data/baz.i

    69

    70

echo "quux: we shouldn't have a merge here"

    71

hg debugindex .hg/data/quux.i

    72

    73

echo "manifest entries should match tips of all files"

    74

hg manifest

    75

    76

echo "everything should be clean now"

    77

hg status

    78

    79

hg verify