Bill Sommerfeld writes:
> On Mon, 2007-08-13 at 14:30 -0700, Mike Kupfer wrote:
>> Another alternative would be to let users plug in their favorite 3-way
>> merge tool, such as the text-based thing that Dave Powell recently
>> wrote.
>
> +1 from me. ideally you'd just use whatever hg merge would
On Mon, 2007-08-13 at 14:30 -0700, Mike Kupfer wrote:
> Another alternative would be to let users plug in their favorite 3-way
> merge tool, such as the text-based thing that Dave Powell recently
> wrote.
+1 from me. ideally you'd just use whatever hg merge would use.
I would be annoyed if I had
Stephen Lau writes:
> Mike Kupfer wrote:
>>> "Rich" == Richard Lowe writes:
>>
>> Rich> I don't seem to have a copy of wx2hg that looks like it would need
>> Rich> to merge
>>
>> See attached.
>>
>> Rich> (and, beyond that, I'm yet to see an occaision where it would need
>> Rich> to merge).
Mike Kupfer writes:
> wx2hg assumes that gpyfm is available for doing any necessary 3-way
> merges. If we keep that simple dependency, then I can't putback wx2hg
> into onnv-gate before gpyfm lands in the gate.
I don't seem to have a copy of wx2hg that looks like it would need to
merge (and, be
> "Mike" == Mike Kupfer writes:
Mike> Okay, I'll invoke $HGMERGE if it's defined, otherwise gpyfm.
Hmm. To be consistent with Mercurial, I guess the default should be
hgmerge, not gpyfm.
mike
Stephen Lau wrote:
Good point. I guess it can wait until we put back the other tools
changes. Are we going to cherry-pick what's in onnv-scm, or are we just
going to putback everything in the onnv-scm usr/src/tools?
>>> I think we'll probably end up putting back everything in onnv-
> "Bill" == Bill Sommerfeld writes:
Bill> ideally you'd just use whatever hg merge would use.
Okay, I'll invoke $HGMERGE if it's defined, otherwise gpyfm.
mike
Richard Lowe wrote:
> Stephen Lau writes:
>
>> Mike Kupfer wrote:
"Rich" == Richard Lowe writes:
>>> Rich> I don't seem to have a copy of wx2hg that looks like it would need
>>> Rich> to merge
>>>
>>> See attached.
>>>
>>> Rich> (and, beyond that, I'm yet to see an occaision where it wo
Mike Kupfer wrote:
>> "Rich" == Richard Lowe writes:
>
> Rich> I don't seem to have a copy of wx2hg that looks like it would need
> Rich> to merge
>
> See attached.
>
> Rich> (and, beyond that, I'm yet to see an occaision where it would need
> Rich> to merge).
>
> This is to handle convers
n/x-sh
Size: 6555 bytes
Desc: wx2hg.sh 379ab1cf4bd5
URL:
<http://mail.opensolaris.org/pipermail/scm-migration-dev/attachments/20070813/f1662c28/attachment.sh>
on
to other stuff.
mike
PS. I've attached the most recent man page.
-- next part --
A non-text attachment was scrubbed...
Name: wx2hg.pdf
Type: application/pdf
Size: 4947 bytes
Desc: wx2hg man page
URL:
<http://mail.opensolaris.org/pipermail/scm-migration-
11 matches
Mail list logo
