diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-17 19:41:36 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-17 19:41:36 +0000 |
| commit | c8d2371b04f76c0239ea98dfb9f207109b4dbad9 (patch) | |
| tree | 2f3b32bd1a838873285e932ab56e864aabe5da76 /Makefile.nmake | |
| parent | 2ce731f2024ea17b7093e712a017105f03226898 (diff) | |
From Pascal Quantin via bug 6593:
With Subversion 1.7, the working copy metada storage as changed (see
http://subversion.apache.org/docs/release-notes/1.7.html#wc-ng for details).
As a consequence, the file .svn/entries is no more updated and under Windows
the svnversion.h is no more regenerated (unless explicitely removed).
The attached patch fixes this issue so as to also check the .svn/wc.db file
date in the makefile rule.
Note that wc.db file must be checked before entries file as an upgrade of an
existing repository from subversion 1.6 to 1.7 leave an old entries file around
(that is no more updated).
In Makefile.am file, the svnversion.h file generation seems to be
systematically forced. So I guess Linux/Mac boxes are not impacted.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39910 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4409d5f3c7..4b5ad1f165 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -396,7 +396,9 @@ ps.c: tools\rdps.py print.ps # # Build the version string # -!IF EXIST(".svn/entries") +!IF EXIST(".svn/wc.db") +SVNENTRIES = .svn/wc.db +!ELSE IF EXIST(".svn/entries") SVNENTRIES = .svn/entries !ELSE SVNENTRIES = |