weird results git dir-diff option

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Fri Jan 03, 2014 10:27 am
when used through
Code: Select all
git difftool --dir-diff

git does create symlinks for the files to be compared, then diffmerge no more compare them…

Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Fri Jan 03, 2014 11:19 am
I know that git provides the --no-symlink option, but for a big repo, this can be a problem

and this option was finely supported in older diffmerge versions…

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Fri Jan 03, 2014 11:26 am
Do you have the configuration variable difftool.<tool>.path set?

The information I'm referencing on using the Git difftool comes from this page: https://www.kernel.org/pub/software/scm ... ftool.html
Beth Kieler
SourceGear Technical Support

Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Sun Jan 05, 2014 6:22 am
Hi,

Difftool configuration is OK, and it works like a charm. The problem is that when used with the dir-diff option, git create symlinks of files to be compared, and it seems diffmerge consider that it should not compare symlinks, even if they share the same name...

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Mon Jan 06, 2014 11:38 am
Yeah, you're right. When I added code to treat symlinks
as first class citizens in the tree (and therefore let you see
that a pair of symlinks have the same/different target), I
broke the previous ability to have a file on one side and a
symlink on the other (either pointing back to the first or to
some other file) and compare the 2 files (or in your case
effectively the file with itself).

I'll log this.

Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Wed Jan 08, 2014 3:25 am
What do you mean by
jeffhostetler wrote:I'll log this.


Does this mean you log it in your bug-tracker, or log it in release notes ?

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Wed Jan 08, 2014 6:41 am
Sorry for the confusion.
I've logged a bug for this.

Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Wed Jan 08, 2014 8:14 am
jeffhostetler wrote:Sorry for the confusion.

It's Ok, I suspected this was what you said, but just wanted to be sure :-)

Thanks for the feedback, and the bug opening :-)

Posts: 1
Joined: Mon Feb 16, 2015 12:07 pm
PostPosted: Mon Feb 16, 2015 12:08 pm
Hi, any progress on this bug? It's unfortunately a real blocker for me for using DiffMerge with git.

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Mon Feb 16, 2015 5:15 pm
Unfortunately this hasn't been completed as of this date. I can see we have the bug logged. I will bump it up in priority.


V: W3981
Beth Kieler
SourceGear Technical Support

Posts: 6
Joined: Fri Jan 03, 2014 10:17 am
PostPosted: Tue Feb 17, 2015 12:53 am
axlrosen wrote:Hi, any progress on this bug? It's unfortunately a real blocker for me for using DiffMerge with git.


axlrosen: until this bug is fixed, I use
Code: Select all
git difftool --dir-diff --no-symlink

and it works, even if it is not the better way to do this.

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 4 guests

cron