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

set -e

     4

set -x

     5

     6

# skip commit logs

     7

HGMERGE=tkmerge; export HGMERGE

     8

EDITOR=true; export EDITOR

     9

    10

rm -rf m m1 m2

    11

mkdir m

    12

cd m

    13

    14

echo "m     this  that"

    15

echo "this" > a

    16

echo "that" > b

    17

hg init

    18

hg addremove

    19

hg commit

    20

echo "a:" `hg dump a` "b:" `hg dump b`

    21

echo

    22

    23

cd ..

    24

echo "m2    this  that "

    25

mkdir m2

    26

cd m2

    27

hg branch ../m

    28

hg checkout

    29

echo "a:" `hg dump a` "b:" `hg dump b`

    30

echo

    31

    32

cd ../m

    33

echo "m     this1 that "

    34

echo "this1" > a

    35

hg commit

    36

echo "a:" `hg dump a` "b:" `hg dump b`

    37

echo

    38

    39

cd ..

    40

echo "m1    this1 that "

    41

mkdir m1

    42

cd m1

    43

hg branch ../m

    44

hg checkout

    45

echo "a:" `hg dump a` "b:" `hg dump b`

    46

echo

    47

    48

cd ../m1

    49

echo "m1    this1 that1"

    50

echo "that1" > b

    51

hg commit

    52

echo "a:" `hg dump a` "b:" `hg dump b`

    53

echo

    54

    55

cd ../m2

    56

echo "m2    this  that2"

    57

echo "that2" > b

    58

hg commit

    59

echo "a:" `hg dump a` "b:" `hg dump b`

    60

echo

    61

    62

cd ../m1

    63

echo "m1:m2 this1 that1 that2"

    64

hg merge ../m2 # b should conflict, a should be fine

    65

echo "a:" `hg dump a` "b:" `hg dump b`

    66

echo

    67

    68

cd ../m2

    69

echo "m2    this2 that2"

    70

echo "this2" > a

    71

hg commit

    72

echo "a:" `hg dump a` "b:" `hg dump b`

    73

echo

    74

    75

cd ../m2

    76

echo "m2:m this12 that2"

    77

hg merge ../m # a should conflict, b should be fine

    78

echo "a:" `hg dump a` "b:" `hg dump b`

    79

echo

    80

    81

# now here's the interesting bit

    82

# if we choose ancestor by file, no conflicts

    83

# otherwise we've got two equally close ancestors, each with a conflict

    84

# if we go back to the root, we'll have both conflicts again

    85

echo "m2:m1 this12 that12"

    86

hg merge ../m1 # should be clean

    87

echo "a:" `hg dump a` "b:" `hg dump b`

    88

echo