Stephen Lau <stevel at sun.com> writes: > Richard Lowe wrote: >> Stephen Lau <stevel at sun.com> writes: >> >>> I've uploaded dep's hgr tool for review here: >>> http://cr.opensolaris.org/~stevel/onnv-scm.hgr/ >>> >> >> Most obviously: >> 44 HGMERGE="$HGR/hgr-collect" hg merge || fail "not able to merge" >> >> Where's hgr-collect? >> >> I'll look more closely at the rest when I can see that bit, too. >> >> >> -- Rich >
both: Copyright notice hgr-collect: CDDL hgr-collect.sh:9 Why wouldn't we want this in .hg/? hgr.sh:181 Do we really want this called "commit" when it doesn't? I appreciate the desire to look like resolve, but resolve actually delgets, doesn't it? Part of me would like to see this hooked up as a merge-app, but I'm not immediately certain if we could. (such that 'HGMERGE=hgr hg merge' worked). If we had a means to run something other than gdiff3 in 'merge', this would close #269 fairly nicely (but imerge does too, I think), though I guess it would somewhat go against the whole point. -- Rich
