AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged refactor

Browse Source 
Added missing status UPDATED_BY_MERGE 
Fixed parsing of file status

FossilOrigin-Name: f82fab41453e6ccf28c60e89ce567635ffab25a3
This commit is contained in:
kostas
2015-04-30 17:43:40 +00:00
parent 122e0e3b28 b897cf7b1e
commit b796cde81b
7 changed files with 131 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
manifest
View File

@ -1,5 +1,5 @@
C Closed\sbranch
D 2015-04-30T16:51:00.874
C Merged\srefactor\nAdded\smissing\sstatus\sUPDATED_BY_MERGE\s\nFixed\sparsing\sof\sfile\sstatus
D 2015-04-30T17:43:40.786
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -200,14 +200,14 @@ F src/Fossil.cpp b54d136f05764535636da04bcc5f60b2eb97e5b6
F src/Fossil.h e46ec6cdb5c23a34176050fbd90e561ac87c07f9
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp f6ffb8c6d1283a812084094426d51a5ea601fa35
F src/MainWindow.h 970c7e42d07499a86b1f6cc5cbe3921e1fc1f9e3
F src/MainWindow.cpp b8d87316df5ca82d6ac9bb0960304ab39489a91f
F src/MainWindow.h d8d376f2efbf47c7a0241bb574994dbcf92300fb
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
F src/Utils.h 8ad68bd227bd999eb6ea92a70bb4be2d6788d912
F src/Workspace.cpp a1ca37e803d6bccb9ddf1f80df66148438e6ea21
F src/Workspace.h 681e3b434455c21613022c95d182ccb35879fc68
F src/Workspace.cpp 199ec5f5aee9e8d9997617aa879cb9a14dafcb1b
F src/Workspace.h 9f1d34320abb378ae5a6e3360f8c8a5949029b88
F src/main.cpp 2ac8badc2a63fa123ceae53382ce24cfe1b5a54b
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
@ -215,10 +215,9 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
F ui/MainWindow.ui c02f609b7f3a33c9be5f420591466ae5e398a988
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P c5152d66a73c5f374ae24fa61c7c9e721e7bb821
R ea2eae273fa42edf7d181d3dcc962763
T +closed *
P e54f1cacad13f429891d89053a208cd340386a3b 54059126aee6bb232373c1f134cc07ea0a6f4cca
R c8caf9794c01c2e9f28e7aab2d817e71
U kostas
Z 587ab2b348930a050cf8c57e671a5c0b
Z 2db0b96e08403561e015298ad9ef24fd