svn-revs:
  - props:
      svn:log: init directories
    nodes:
      - path: trunk
        kind: dir
        action: add
      - path: branches
        kind: dir
        action: add
  - props:
      svn:log: create A
    nodes:
      - path: trunk/A
        kind: file
        action: add
        text: "file A\n"
  - props:
      svn:log: create branch b1 from trunk
    nodes:
      - path: branches/b1
        kind: dir
        action: add
        copy-from-path: trunk
  - props:
      svn:log: modify A
    nodes:
      - path: branches/b1/A
        kind: file
        action: change
        text: "file A 2\n"
  - props:
      svn:log: create B
    nodes:
      - path: branches/b1/B
        kind: file
        action: add
        text: "file B\n"
  - props:
      svn:log: merge b1:5 into trunk
    nodes:
      - path: trunk
        kind: dir
        action: change
        props:
          svn:mergeinfo: |
            /branches/b1:5
      - path: trunk/B
        kind: file
        action: add
        text: "file B\n"

conv-params: |
  branches = [
    "trunk",
    "branches/*",
  ]
  rename-branches."trunk" = "master"
  rename-branches."branches/*" = "*"

  merge-optional = [
    "**/A",
  ]

logs: |
  D svn2git::convert::stage2: emitting branch commits and tags for SVN revision 6
  D svn2git::convert::stage2: candidate to be merged: "branches/b1"@5
  D svn2git::convert::stage2: merging into "trunk"

git-revs:
  - rev: master~2
    parents: []
    tree: {}
  - rev: master~1
    parents: [master~2]
    tree:
      A:
        type: normal
        data: "file A\n"
  - rev: b1~2
    parents: [master~1]
    tree:
      A:
        type: normal
        data: "file A\n"
  - rev: b1~1
    parents: [b1~2]
    tree:
      A:
        type: normal
        data: "file A 2\n"
  - rev: b1~0
    parents: [b1~1]
    tree:
      A:
        type: normal
        data: "file A 2\n"
      B:
        type: normal
        data: "file B\n"
  - rev: master~0
    parents: [master~1, b1~0]
    tree:
      A:
        type: normal
        data: "file A\n"
      B:
        type: normal
        data: "file B\n"