Smalltalk › Squeak › Squeak - Dev

[squeak-dev] How to diff two Monticello package versions?

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

Sophie424

[squeak-dev] How to diff two Monticello package versions?

I have two packages, possibly in different repositories, and I would like to
diff (and possibly merge) them.

Do I have to load one first, then do "Changes" with the other? Then do a
"Merge"? Any other ways?

(I googled and found some undated pointers on visoracle.com)

Thanks - Sophie

Tapple Gao

Re: [squeak-dev] How to diff two Monticello package versions?

On Fri, Apr 04, 2008 at 09:56:54AM -0500, itsme213 wrote:
> I have two packages, possibly in different repositories, and I would like to
> diff (and possibly merge) them.
>
> Do I have to load one first, then do "Changes" with the other? Then do a
> "Merge"? Any other ways?

Monticello 1.5 has an arbitrary package diff tool. But in your
case, I don't think it will help. "Merging" means loading two
versions of a package into your working copy, resolving
conflicts, and saving a new version, so you have to load them
anyway.

--
Matthew Fulmer -- http://mtfulmer.wordpress.com/

Gary Chambers-4

RE: [squeak-dev] How to diff two Monticello package versions?

(Cross-post from UI list)

Just released (as in uploaded versions) of the "Diff Tools" on SqueakSource.
Check here: http://wiki.squeak.org/squeak/6005 for details.

Have fun!
Gary

> -----Original Message-----
> From: [hidden email]
> [mailto:[hidden email]]On Behalf Of
> Matthew Fulmer
> Sent: 04 April 2008 5:24 PM
> To: [hidden email]
> Subject: Re: [squeak-dev] How to diff two Monticello package versions?
>
>
> On Fri, Apr 04, 2008 at 09:56:54AM -0500, itsme213 wrote:
> > I have two packages, possibly in different repositories, and I
> would like to
> > diff (and possibly merge) them.
> >
> > Do I have to load one first, then do "Changes" with the other?
> Then do a
> > "Merge"? Any other ways?
>
> Monticello 1.5 has an arbitrary package diff tool. But in your
> case, I don't think it will help. "Merging" means loading two
> versions of a package into your working copy, resolving
> conflicts, and saving a new version, so you have to load them
> anyway.
>
> --
> Matthew Fulmer -- http://mtfulmer.wordpress.com/
>