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

cat <<'EOF' > merge

     4

#!/bin/sh

     5

echo merging for `basename $1`

     6

EOF

     7

chmod +x merge

     8

     9

mkdir t

    10

cd t

    11

hg init

    12

echo This is file a1 > a

    13

hg add a

    14

hg commit -m "commit #0" -d "0 0"

    15

echo This is file b1 > b

    16

hg add b

    17

hg commit -m "commit #1" -d "0 0"

    18

    19

hg update 0

    20

echo This is file c1 > c

    21

hg add c

    22

hg commit -m "commit #2" -d "0 0"

    23

echo This is file b1 > b

    24

env HGMERGE=../merge hg update -m 1

    25

# no merges expected

    26

cd ..; /bin/rm -rf t

    27

    28

mkdir t

    29

cd t

    30

hg init

    31

echo This is file a1 > a

    32

hg add a

    33

hg commit -m "commit #0" -d "0 0"

    34

echo This is file b1 > b

    35

hg add b

    36

hg commit -m "commit #1" -d "0 0"

    37

    38

hg update 0

    39

echo This is file c1 > c

    40

hg add c

    41

hg commit -m "commit #2" -d "0 0"

    42

echo This is file b2 > b

    43

env HGMERGE=../merge hg update -m 1

    44

# merge of b expected

    45

cd ..; /bin/rm -rf t

    46

    47

mkdir t

    48

cd t

    49

hg init

    50

echo This is file a1 > a

    51

hg add a

    52

hg commit -m "commit #0" -d "0 0"

    53

echo This is file b1 > b

    54

hg add b

    55

hg commit -m "commit #1" -d "0 0"

    56

echo This is file b22 > b

    57

hg commit -m "commit #2" -d "0 0"

    58

hg update 1

    59

echo This is file c1 > c

    60

hg add c

    61

hg commit -m "commit #3" -d "0 0"

    62

cat b

    63

echo This is file b22 > b

    64

env HGMERGE=../merge hg update -m 2

    65

# merge expected!

    66

cd ..; /bin/rm -rf t

    67

    68

mkdir t

    69

cd t

    70

hg init

    71

echo This is file a1 > a

    72

hg add a

    73

hg commit -m "commit #0" -d "0 0"

    74

echo This is file b1 > b

    75

hg add b

    76

hg commit -m "commit #1" -d "0 0"

    77

echo This is file b22 > b

    78

hg commit -m "commit #2" -d "0 0"

    79

hg update 1

    80

echo This is file c1 > c

    81

hg add c

    82

hg commit -m "commit #3" -d "0 0"

    83

echo This is file b33 > b

    84

env HGMERGE=../merge hg update -m 2

    85

# merge of b expected

    86

cd ..; /bin/rm -rf t