fcbe317481bbd5d38d3a3f4a9aff5f1a1d4fcf2a
David Blume first commit

David Blume authored 7 years ago

1) # same\_as\_p4\_reconcile.py
2) 
3) This is a Python 3 script that's nearly the same as simply running "p4 reconcile".
4) 
5) I'd already started writing it before I realized what a duplication of effort it was. So, of course, I decided to memorialize it here.
6) 
7) To preview how a reconcile would look, issue a command like so:
8) 
9)     same_as_p4_reconcile.py -c 48 -n source_dir/ p4_dir/
10) 
11) Of course, issue the command with -h or --help to learn more.
12) 
13)     same_as_p4_reconcile.py --help
David Blume Update README.md

David Blume authored 7 years ago

14)     usage: same_as_p4_reconcile.py [-h] [-c CHANGELIST] [-n] source_dir p4_dir
15)     
16)     Similar to "p4 reconcile"
17)     
18)     positional arguments:
19)       source_dir            The newer directory outside perforce
20)       p4_dir                The perforce directory to be modified
21)     
22)     optional arguments:
23)       -h, --help            show this help message and exit
24)       -c CHANGELIST, --changelist CHANGELIST
25)                             Changelist to use
David Blume Document the -n flag.

David Blume authored 7 years ago

26)       -n, --preview         Preview only, don't change any files
David Blume Update README.md

David Blume authored 7 years ago

27) 
28) ### So you put a Perforce script in a Git repo?
29) 
30) Wait, what?