mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
test-rebase-conflicts: enable segmented changelog
Reviewed By: singhsrb Differential Revision: D24258215 fbshipit-source-id: 9a9bba13c3963c79df5e672e5ac011ab7c7e5698
This commit is contained in:
parent
20ac277bc5
commit
293d05dd40
@ -557,6 +557,7 @@ segmentedchangelogcompatiblelist = """
|
|||||||
test-pushvars-t.py
|
test-pushvars-t.py
|
||||||
test-rebase-bookmarks.t
|
test-rebase-bookmarks.t
|
||||||
test-rebase-collapse.t
|
test-rebase-collapse.t
|
||||||
|
test-rebase-conflicts.t
|
||||||
test-rebase-dest.t
|
test-rebase-dest.t
|
||||||
test-rebase-detach.t
|
test-rebase-detach.t
|
||||||
test-rebase-flags.t
|
test-rebase-flags.t
|
||||||
|
@ -166,18 +166,18 @@ Check that the right ancestors is used while rebasing a merge (issue4041)
|
|||||||
│ │ │ date: Thu Sep 05 12:57:59 2013 -0400
|
│ │ │ date: Thu Sep 05 12:57:59 2013 -0400
|
||||||
│ │ │ summary: bad merge
|
│ │ │ summary: bad merge
|
||||||
│ │ │
|
│ │ │
|
||||||
|
│ │ o commit: 400110238667
|
||||||
|
│ │ │ branch: f2
|
||||||
|
│ │ │ user: szhang
|
||||||
|
│ │ │ date: Tue Sep 03 13:58:02 2013 -0400
|
||||||
|
│ │ │ summary: changed f2 on f2
|
||||||
|
│ │ │
|
||||||
o │ │ commit: 4c9fbe56a16f
|
o │ │ commit: 4c9fbe56a16f
|
||||||
├─╯ │ branch: f1
|
├─╯ │ branch: f1
|
||||||
│ │ user: szhang
|
│ │ user: szhang
|
||||||
│ │ date: Thu Sep 05 12:54:00 2013 -0400
|
│ │ date: Thu Sep 05 12:54:00 2013 -0400
|
||||||
│ │ summary: changed f1
|
│ │ summary: changed f1
|
||||||
│ │
|
│ │
|
||||||
│ o commit: 400110238667
|
|
||||||
│ │ branch: f2
|
|
||||||
│ │ user: szhang
|
|
||||||
│ │ date: Tue Sep 03 13:58:02 2013 -0400
|
|
||||||
│ │ summary: changed f2 on f2
|
|
||||||
│ │
|
|
||||||
│ @ │ commit: d79e2059b5c0
|
│ @ │ commit: d79e2059b5c0
|
||||||
│ │ │ user: szhang
|
│ │ │ user: szhang
|
||||||
│ │ │ date: Tue Sep 03 13:57:39 2013 -0400
|
│ │ │ date: Tue Sep 03 13:57:39 2013 -0400
|
||||||
|
Loading…
Reference in New Issue
Block a user