You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+17-1Lines changed: 17 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -86,6 +86,16 @@ These execution times are expected to scale as expected with larger depots (mill
86
86
Specify which P4USER to use. Please ensure that the user is logged in.
87
87
```
88
88
89
+
### Capturing Output
90
+
91
+
Though not required, we recommend capturing the output from standard out and standard error. This allows you to review any errors reported by the tool, and also captures the mapping between the git commit ID, git branch, and Perforce changelist.
92
+
93
+
With a POSIX shell, you can capture them both to the same file with:
94
+
95
+
```shell
96
+
p4-fusion ARGUMENTS 2>&1| tee p4-fusion.log
97
+
```
98
+
89
99
## Notes On Branches
90
100
91
101
When at least one branch argument exists, the tool will enable branching mode.
@@ -131,7 +141,7 @@ A side effect of stream mapping mode is that you can use stream mappings to excl
131
141
132
142
In order to test the validity of the logic, we need to run the program over a Perforce depot and compare each changelist against the corresponding Git commit SHA, to ensure the files match up.
133
143
134
-
The provided script [validate-migration.sh](validate-migration.sh) runs through every generated Git commit, and ensures the file state exactly matches the state of the Perforce depot.
144
+
The provided script [validate-migration.sh](validate-migration.sh) runs through every generated Git commit, and ensures the file state exactly matches the state of the Perforce depot. In order to run this script, you must capture the output from the p4-fusion command to a file.
135
145
136
146
Because of the extra effort the script performs, expect it to take orders of magnitude longer than the original p4-fusion execution.
137
147
@@ -193,6 +203,12 @@ There should be a Git repo being created in the `clones/.git` directory with com
193
203
194
204
> Note: The Git repository is created bare i.e. without a working directory and running the same command again shall detect the last committed CL and only continue from that CL onwards. Binaries files are ignored by default and this behaviour can be changed by using the `--includeBinaries` option. We do not handle `.git` directories in the Perforce history.
195
205
206
+
If you wish to check your results with the [validate-migration.sh](#checking-results) script, then you will also need to capture the output from standard out. You can do that by running the command, like above, with the standard shell commands to pipe the output to a file:
207
+
208
+
```shell
209
+
./build/p4-fusion/p4-fusion ARGUMENTS | tee p4-fusion.log
210
+
```
211
+
196
212
## Contributing
197
213
198
214
Please refer to [CONTRIBUTING.md](CONTRIBUTING.md)
0 commit comments