In response to a problem that John Levon was seeing, I've changed wx2hg
to check the ancestor file before doing a 3-way merge. If the ancestor
doesn't match the file in the (Teamware) parent workspace, wx2hg errors
out with a message like
3-way merge: usr/src/tools/scripts/Makefile.new
wx
On Thu, Aug 23, 2007 at 08:17:48PM -0700, Mike Kupfer wrote:
> I appreciate the testing and feedback, and I'll see what I can do to
> make the script more robust. But please keep in mind that wx2hg is
> intended as a short-term migration aid.
Sure, of course.
> John> wx2hg: can't rename: usr/sr
On Wed, Aug 22, 2007 at 12:29:53PM -0700, Mike Kupfer wrote:
> ...which incorporates code review feedback from Rich and Steve.
>
> http://cr.opensolaris.org/~kupfer/wx2hg/
I didn't get very far in the "can I use this without reading the manual" test:
$ ~/wx2hg.sh -r onnv_70 /export/build/johnle
> "John" == John Levon writes:
John> The script seems to be missing some 'mkdir' action.
D'oh! I guess I need to review my test cases.
>> Or I could change the rename error handler to see if the file exists
>> as the new name and suggest that you rerun after doing "update -C".
John> This
> "John" == John Levon writes:
John> I didn't get very far in the "can I use this without reading the
John> manual" test:
I appreciate the testing and feedback, and I'll see what I can do to
make the script more robust. But please keep in mind that wx2hg is
intended as a short-term migratio
Mike Kupfer writes:
> ...which incorporates code review feedback from Rich and Steve.
>
> http://cr.opensolaris.org/~kupfer/wx2hg/
>
> I plan to push the changes on Thursday unless someone tells me not to.
>
It maybe worth testing it with active project gates (pick one, I don't
know what the opt
...which incorporates code review feedback from Rich and Steve.
http://cr.opensolaris.org/~kupfer/wx2hg/
I plan to push the changes on Thursday unless someone tells me not to.
mike
