diff options
| author | click <none@none> | 2010-06-24 18:46:38 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-06-24 18:46:38 +0200 |
| commit | 931a827a0f1b44daf3ee995666fbd7479a59fa2c (patch) | |
| tree | 239179919c78819ee970e8fe28f0c710d39e72cd | |
| parent | e7a3785d73cd0e736570081afbffcd2743e4f828 (diff) | |
Fix genrevision to use the revision of the CHECKED OUT sourcetree, not the revision from when it was last CACHED (BAH-HUMBUG-CRAP-BUG! Grrrr...)
--HG--
branch : trunk
| -rw-r--r-- | src/genrevision/genrevision.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp index 7e304b25a7e..35bb315088c 100644 --- a/src/genrevision/genrevision.cpp +++ b/src/genrevision/genrevision.cpp @@ -404,13 +404,13 @@ int main(int argc, char **argv) res = extractDataFromSvn(path+"_svn/entries",use_url,data); // HG data if (!res) - res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); - if (!res) - res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); - if (!res) res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data); if (!res) res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); // GIT data if (!res) res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data); @@ -430,13 +430,13 @@ int main(int argc, char **argv) res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data); // HG data if (!res) - res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); - if (!res) - res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); - if (!res) res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data); if (!res) res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); /// SVN data if (!res) res = extractDataFromSvn(path+".svn/entries",use_url,data); @@ -452,13 +452,11 @@ int main(int argc, char **argv) else if(hg_prefered) { // HG data - res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); - if (!res) - res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); - if (!res) - res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data); + res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data); if (!res) res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); /// SVN data if (!res) res = extractDataFromSvn(path+".svn/entries",use_url,data); |