Hi Mike at 27.07.2011 15:08, Mike Noyes wrote: > On Wed, 2011-07-27 at 08:16 +0200, Erich Titl wrote: >> at 26.07.2011 20:45, KP Kirchdoerfer wrote: >>> Am Montag, 25. Juli 2011, 16:13:08 schrieb Erich Titl: >>>> at 25.07.2011 10:12, KP Kirchdoerfer wrote: >>>>> Am Sonntag, 24. Juli 2011, 23:03:23 schrieb Erich Titl: > -snip- >>>> This >>>> will not enhance the capability to compare files between the branches >>>> though. We need to find a solution for this in the long run. >>> >>> There should be one, it's not on unusual task IMHO. >> >> Right, I just cannot find the right syntax and git documentation is big >> but sucks. > > Erich, > Did you look at the git tutorials? It looks like diff is covered in git > tutorial 2.
No I have not read the entire GIT docs. The heap of documentation about
git diff alone makes me shiver. Googling the problem unveils a good
number of lost souls just like me without getting a resonable answer.
In the meantime, by trial and error, I found a way to get what I want.
For the benefit of others that look at the same problem, here is the
simple solution. Every solution is simple once you found it :-(
To compare my webconf subtree between the curret branch (master) and my
local exprimental branch I use:
git diff experimental webconf
diff --git a/repo/webconf/buildtool.cfg b/repo/webconf/buildtool.cfg
index d8de001..96f034e 100644
--- a/repo/webconf/buildtool.cfg
+++ b/repo/webconf/buildtool.cfg
@@ -14,16 +14,9 @@
Server = localrepo
Revision = HEAD
Directory = webconf
- envname = WEBCONF_TARBALL
+ envname = SOURCE_TARBALL
</File>
-
-<File haserl-0.9.29.tar.gz>
- Server = localrepo
- Revision = HEAD
- Directory = haserl
- envname = HASERL_TARBALL
-</File>
-
+
<Package>
<webconf>
Version = 1.2
diff --git a/repo/webconf/buildtool.mk b/repo/webconf/buildtool.mk
index adde7a0..20a3b78 100644
--- a/repo/webconf/buildtool.mk
+++ b/repo/webconf/buildtool.mk
@@ -8,32 +8,23 @@ include $(MASTERMAKEFILE)
#####################################################
# Build webconf
-WEBCONF_DIR:=$(shell basename `tar tzf $(WEBCONF_TARBALL) | head -1`)
+WEBCONF_DIR:=$(shell basename `tar tzf $(SOURCE_TARBALL) | head -1`)
WEBCONF_TARGET_DIR:=$(BT_BUILD_DIR)/webconf
-HASERL_DIR:=$(shell basename `tar tzf $(HASERL_TARBALL) | head -1`)
-HASERL_TARGET_DIR:=$(BT_BUILD_DIR)/haserl
.............................
For tarballs this is a lot more challenging.... :-)
git diff experimental lwp
diff --git a/repo/lwp/lwp-1.tar.gz b/repo/lwp/lwp-1.tar.gz
index 40db928..07a59aa 100644
Binary files a/repo/lwp/lwp-1.tar.gz and b/repo/lwp/lwp-1.tar.gz differ
Well, you can't have everything. But then the only difference may be the
time stamp on the files within the tarball.
cheers
Erich
smime.p7s
Description: S/MIME Kryptografische Unterschrift
------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
