On Mon, 2010-11-01 at 06:30 +1000, Kai wrote: > On 27 October 2010 19:22, Tom Dalton <[email protected]> wrote: > > On Wed, 2010-10-27 at 18:52 +1000, Kai wrote: > >> On 27 October 2010 18:09, Tom Dalton <[email protected]> wrote: > >> > On Wed, 2010-10-27 at 06:06 +1000, Kai wrote: > >> >> On 26 October 2010 22:53, Tom Dalton <[email protected]> wrote: > >> >> > Hi, > >> >> > > >> >> > Is it possible to start up meld with multiple CVS modules being > >> >> > directory-compared? > >> >> > > >> >> > E.g. in my working dir I have proj1 and proj2. They are effectively > >> >> > totally different projects. I can achieve what I want by running > >> >> > > >> >> > meld proj1 > >> >> > > >> >> > When meld appears, I go file->new->version control browser and select > >> >> > proj2. I now have 2 separate tabs with different directory comparisons > >> >> > in each, both against the CVS branch for proj1 and 2 respectively. > >> >> > > >> >> > I now want to be able to script this, so that I can automatically > >> >> > bring > >> >> > up the directory comparisons for many modules. I can't find a way to > >> >> > do > >> >> > this on the command line, running > >> >> > > >> >> > Running "meld proj1 proj2" causes meld to try to directly difference > >> >> > the > >> >> > two directories, but the are completely unrelated. Running meld once > >> >> > per > >> >> > directory difference is possible, but I don't really want to run many > >> >> > instances. > >> >> > >> >> I think what you want is: > >> >> meld --diff proj1 --diff proj2 > >> >> > >> >> The --diff flag takes a variable number of arguments and treats them > >> >> in the same way as normal extra arguments, adding each set parsed as a > >> >> new tab. > >> >> > >> >> cheers, > >> >> Kai > >> > > >> > On the version I'm using (1.3.0) the --diff argument isn't documented, > >> > but it just 2 tabs, each a directory tree for proj1 and proj2. It > >> > doesn't show the differences between these working copies and the CVS > >> > branch :-( > >> > > >> > Tom > >> > >> It should definitely work, but I don't know what version you'll need. > >> Try downloading a later version from: > >> http://ftp.gnome.org/pub/gnome/sources/meld/ > >> > >> If installing is a problem, you can just run Meld (bin/meld) from the > >> unarchived directory, which makes it easy to try out a new version. > >> > >> cheers, > >> Kai > > > > I've just tried with 1.4 and the behaviour is the same - it doesn't seem > > to realise the directories I'm supplying are CVS modules > > > > Running "meld proj1" results in the expected list of changed files > > between proj1 and the CVS branch, but "meld --diff proj1" just brings up > > a directory-tree of all of the local proj1 without any changes > > displayed... > > Gah, my bad. The fix for this actually went in after 1.4.0. If you > want to apply the (one line) fix yourself, it's at: > http://git.gnome.org/browse/meld/commit/?id=c15a263be8580c29ce0993fd660033aa38535f0c > > cheers, > Kai
That's brilliant, thanks a lot! Tom _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
