Patchwork D6369: templatekw: make {file_*} compare to both merge parents (issue4292)

login
register
mail settings
Submitter Yuya Nishihara
Date May 26, 2019, 11:30 p.m.
Message ID <20190527083038.db046dd6044463d8f058a3e8@tcha.org>
Download mbox | patch
Permalink /patch/40245/
State New
Headers show

Comments

Yuya Nishihara - May 26, 2019, 11:30 p.m.
Test failures:

```

ERROR: test-convert-bzr.t output changed
```
phabricator - May 26, 2019, 11:31 p.m.
yuja added a comment.


  Test failures:
  
    --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t
    +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t.err
    @@ -59,7 +59,7 @@
       $ glog -R source-hg
       o    5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed]
       |\
    -  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
    +  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
       | |\
       o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
        / /
    @@ -154,7 +154,7 @@
       $ glog -R hg2hg
       @    5@source "(octopus merge fixup)" files+: [], files-: [], files: []
       |\
    -  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
    +  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
       | |\
       o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
        / /
    
    ERROR: test-convert-bzr-merges.t output changed
    !......................................ss..........
    --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t
    +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t.err
    @@ -147,7 +147,7 @@
       1 Editing b
       0 Merged improve branch
       $ glog -R source-hg
    -  o    3@source "Merged improve branch" files+: [], files-: [], files: [b]
    +  o    3@source "Merged improve branch" files+: [], files-: [], files: []
       |\
       | o  2@source-improve "Editing b" files+: [], files-: [], files: [b]
       | |
    
    ERROR: test-convert-bzr.t output changed

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6369

To: martinvonz, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

--- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t
+++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-merges.t.err
@@ -59,7 +59,7 @@ 
   $ glog -R source-hg
   o    5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed]
   |\
-  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
+  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
   | |\
   o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
    / /
@@ -154,7 +154,7 @@ 
   $ glog -R hg2hg
   @    5@source "(octopus merge fixup)" files+: [], files-: [], files: []
   |\
-  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
+  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
   | |\
   o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
    / /

ERROR: test-convert-bzr-merges.t output changed
!......................................ss..........
--- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t
+++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t.err
@@ -147,7 +147,7 @@ 
   1 Editing b
   0 Merged improve branch
   $ glog -R source-hg
-  o    3@source "Merged improve branch" files+: [], files-: [], files: [b]
+  o    3@source "Merged improve branch" files+: [], files-: [], files: []
   |\
   | o  2@source-improve "Editing b" files+: [], files-: [], files: [b]
   | |