shelve diff local files, use P4DIFF tool #5
Open
justrajdeep wants to merge 5 commits intoJonParr:masterfrom
Open
shelve diff local files, use P4DIFF tool #5justrajdeep wants to merge 5 commits intoJonParr:masterfrom
justrajdeep wants to merge 5 commits intoJonParr:masterfrom
Conversation
Made-with: Cursor
Replace the short HTML-style intro with structured Markdown that documents how the CLI works end-to-end: Helix/p4 and Python 3 (uv) requirements, the full option surface (-c/--changelist, -s/--shelved, -l/--local, -t/--ticket, -v/--verbose), and the three operational paths (opened changelist, shelved depot-vs-depot via p4 diff2, shelved vs workspace via p4 print + diff). Spell out which p4 commands drive file lists and diffs for add/edit/delete/ integrate/branch/move cases, note empty-diff detection, P4DIFF behavior, examples for saving patches and dry-run patch application, stdout/stderr and UTF-8 decoding behavior, and explicit limitations (describe/where line parsing, temp file lifecycle, integrate grouping, verbose corrupting patch streams, and why default changelist naming is wrong for shelves). Add a repository layout table and a related-tools pointer to JonParr/p4-diff. Made-with: Cursor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added support for P4DIFF tool and shelve diff of local files