tests/test-merge7.t
author Pradeepkumar Gayam <in3xes@gmail.com>
Wed, 18 Aug 2010 05:54:00 +0530
changeset 11980 c443e95d295b
parent 6888 tests/test-merge7@7c36a4fb05a3
child 12156 4c94b6d0fb1c
permissions -rw-r--r--
tests: unify test-merge7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     1
initial
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     2
  $ hg init test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     3
  $ cd test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     4
  $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     5
  > 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     6
  > 2
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     7
  > 3
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     8
  > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
     9
  $ hg add test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    10
  $ hg commit -m "Initial" -d "1000000 0"
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    11
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    12
clone
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    13
  $ cd ..
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    14
  $ hg clone test-a test-b
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    15
  updating to branch default
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    16
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    17
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    18
change test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    19
  $ cd test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    20
  $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    21
  > one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    22
  > two
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    23
  > three
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    24
  > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    25
  $ hg commit -m "Numbers as words" -d "1000000 0"
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    26
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    27
change test-b
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    28
  $ cd ../test-b
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    29
  $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    30
  > 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    31
  > 2.5
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    32
  > 3
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    33
  > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    34
  $ hg commit -m "2 -> 2.5" -d "1000000 0"
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    35
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    36
now pull and merge from test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    37
  $ hg pull ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    38
  pulling from ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    39
  searching for changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    40
  adding changesets
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    41
  adding manifests
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    42
  adding file changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    43
  added 1 changesets with 1 changes to 1 files (+1 heads)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    44
  (run 'hg heads' to see heads, 'hg merge' to merge)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    45
  $ hg merge
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    46
  merging test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    47
  warning: conflicts during merge.
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    48
  merging test.txt failed!
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    49
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    50
  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    51
resolve conflict
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    52
  $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    53
  > one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    54
  > two-point-five
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    55
  > three
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    56
  > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    57
  $ rm -f *.orig
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    58
  $ hg resolve -m test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    59
  $ hg commit -m "Merge 1" -d "1000000 0"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    60
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    61
change test-a again
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    62
  $ cd ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    63
  $ cat >test.txt <<"EOF"
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    64
  > one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    65
  > two-point-one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    66
  > three
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    67
  > EOF
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    68
  $ hg commit -m "two -> two-point-one" -d "1000000 0"
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    69
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    70
pull and merge from test-a again
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    71
  $ cd ../test-b
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    72
  $ hg pull ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    73
  pulling from ../test-a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    74
  searching for changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    75
  adding changesets
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    76
  adding manifests
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    77
  adding file changes
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    78
  added 1 changesets with 1 changes to 1 files (+1 heads)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    79
  (run 'hg heads' to see heads, 'hg merge' to merge)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    80
  $ hg merge --debug
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    81
    searching for copies back to rev 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    82
  resolving manifests
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    83
   overwrite None partial False
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    84
   ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    85
   test.txt: versions differ -> m
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    86
  preserving test.txt for resolve of test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    87
  updating: test.txt 1/1 files (100.00%)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    88
  picked tool 'internal:merge' for test.txt (binary False symlink False)
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    89
  merging test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    90
  my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    91
  warning: conflicts during merge.
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    92
  merging test.txt failed!
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    93
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    94
  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    95
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    96
  $ cat test.txt
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    97
  one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    98
  <<<<<<< local
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
    99
  two-point-five
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   100
  =======
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   101
  two-point-one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   102
  >>>>>>> other
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   103
  three
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   104
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   105
  $ hg debugindex .hg/store/data/test.txt.i
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   106
     rev    offset  length   base linkrev nodeid       p1           p2
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   107
       0         0       7      0       0 01365c4cca56 000000000000 000000000000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   108
       1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   109
       2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   110
       3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   111
       4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   112
11980
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   113
  $ hg log
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   114
  changeset:   4:a070d41e8360
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   115
  tag:         tip
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   116
  parent:      2:faaea63e63a9
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   117
  user:        test
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   118
  date:        Mon Jan 12 13:46:40 1970 +0000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   119
  summary:     two -> two-point-one
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   120
  
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   121
  changeset:   3:451c744aabcc
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   122
  parent:      1:e409be6afcc0
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   123
  parent:      2:faaea63e63a9
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   124
  user:        test
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   125
  date:        Mon Jan 12 13:46:40 1970 +0000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   126
  summary:     Merge 1
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   127
  
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   128
  changeset:   2:faaea63e63a9
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   129
  parent:      0:095c92b91f1a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   130
  user:        test
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   131
  date:        Mon Jan 12 13:46:40 1970 +0000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   132
  summary:     Numbers as words
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   133
  
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   134
  changeset:   1:e409be6afcc0
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   135
  user:        test
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   136
  date:        Mon Jan 12 13:46:40 1970 +0000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   137
  summary:     2 -> 2.5
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   138
  
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   139
  changeset:   0:095c92b91f1a
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   140
  user:        test
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   141
  date:        Mon Jan 12 13:46:40 1970 +0000
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   142
  summary:     Initial
c443e95d295b tests: unify test-merge7
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 6888
diff changeset
   143