File: treeConflictsParser

package info (click to toggle)
libnb-platform18-java 12.1-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 729,800 kB
  • sloc: java: 5,059,097; xml: 574,432; php: 78,788; javascript: 29,039; ansic: 10,278; sh: 6,386; cpp: 4,612; jsp: 3,643; sql: 1,097; makefile: 540; objc: 288; perl: 277; haskell: 93
file content (11 lines) | stat: -rw-r--r-- 2,826 bytes parent folder | download | duplicates (5) 
1
2
3
4
5
6
7
8
9
10
11
 
()###
###
 ###
(   )###
((conflict newfile file update deleted deleted (version file:///home/repositoryABC/repository 3 156 15 Project/newfile none) (version file:///home/repositoryABC/repository 3 158 15 Project/newfile none)))###newfile#1#2#2#file:///home/repositoryABC/repository#156#Project/newfile#0#file:///home/repositoryABC/repository#158#Project/newfile#0
((conflict 5 1file file update deleted edited (version repoURL 3 159 13 Project/1file file) (version repoURL 3 160 13 Project/1file none)))###1file#1#2#0#repoURL#159#Project/1file#1#repoURL#160#Project/1file#0
((conflict f file update edited deleted (version repoURL 3 159 Project/f none) (version repoURL 3 160 Project/f file)))###f#1#0#2#repoURL#159#Project/f#0#repoURL#160#Project/f#1
((conflict f file switch edited deleted (version repoURL 3 159 Project/f none) (version repoURL 3 160 Project/f file)))###f#2#0#2#repoURL#159#Project/f#0#repoURL#160#Project/f#1
((conflict f file merge edited deleted (version repoURL 3 159 Project/f none) (version repoURL 3 160 Project/f file)))###f#3#0#2#repoURL#159#Project/f#0#repoURL#160#Project/f#1
((conflict f file update edited deleted (version repoURL 3 159 Project/f none) (version repoURL 3 160 Project/f file))(conflict f2 file switch edited deleted (version repoURL 3 159 Project/f2 none) (version repoURL 3 160 Project/f2 file))   (conflict f3 file merge edited deleted (version repoURL 3 159 Project/f3 none) (version repoURL 3 160 Project/f3 file)))###f#1#0#2#repoURL#159#Project/f#0#repoURL#160#Project/f#1##f2#2#0#2#repoURL#159#Project/f2#0#repoURL#160#Project/f2#1##f3#3#0#2#repoURL#159#Project/f3#0#repoURL#160#Project/f3#1
((conflict 13 new fil( )e 2 file update added added (version     file:///home/ondra/NetBeansProjects/SVN179412/repository 3 161   57 179412TreeConflicts/src/treeconflicts/new%20fil(%20)e%202 none) (version file:///home/ondra/NetBeansProjects/SVN179412/repository 3 162 57 179412TreeConflicts/src/treeconflicts/new%20fil(%20)e%202 file)) (conflict 11 new fil( )e file update deleted deleted (version file:///home/ondra/NetBeansProjects/SVN179412/repository 3 161 53 179412TreeConflicts/src/treeconflicts/new%20fil(%20)e none) (version file:///home/ondra/NetBeansProjects/SVN179412/repository 3 162 53 179412TreeConflicts/src/treeconflicts/new%20fil(%20)e none)))###new fil( )e 2#1#1#5#file:///home/ondra/NetBeansProjects/SVN179412/repository#161#179412TreeConflicts/src/treeconflicts/new%20fil(%20)e%202#0#file:///home/ondra/NetBeansProjects/SVN179412/repository#162#179412TreeConflicts/src/treeconflicts/new%20fil(%20)e%202#1##new fil( )e#1#2#2#file:///home/ondra/NetBeansProjects/SVN179412/repository#161#179412TreeConflicts/src/treeconflicts/new%20fil(%20)e#0#file:///home/ondra/NetBeansProjects/SVN179412/repository#162#179412TreeConflicts/src/treeconflicts/new%20fil(%20)e#0