On Mar 19, 2010, at 2:09 PM, Lorin Rivers wrote:
> I searched the google group, did some googling, and basically came up empty.
>
> I'm contemplating one of the DSVNs for a project and was wondering how people
> who use those AND BBEdit handle their workflows.
I’ve used both git and hg for significant projects, in conjunction with BBEdit.
My typical workflow involves doing most operations from the command line (which
isn’t all that different from the workflow I use when using p4 or svn), and
using BBEdit (via $VISUAL=“bbedit —wait —resume”) as my EDITOR.
Where BBEdit is invaluable to me in this workflow is for reviewing diffs before
committing.
For git, I have a script named git-diff-driver.sh with the contents:
#!/bin/sh
if [ -f "$1" ] && [ -f "$2" ]; then
bbdiff --wait --resume "$1" "$2"
fi
exit 0
and then set GIT_EXTERNAL_DIFF to point at this script. `git diff` will review
the files one by one in BBEdit. You can specify —no-ext-diff to get the
built-in behavior.
For hg, I’ve just added this to my hgrc file:
[extdiff]
cmd.bbdiff = bbdiff
opts.bbdiff = --reverse --wait —resume
and now `hg bbdiff` will do a single or multi-fill diff in BBEdit from the
command line (depending upon args passed, and how many outstanding changes
there are.)
- Jim
--
You received this message because you are subscribed to the
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem,
please email "[email protected]" rather than posting to the group.
To unsubscribe from this group, send email to
bbedit+unsubscribegooglegroups.com or reply to this email with the words
"REMOVE ME" as the subject.
