Import history from a second repository
I’ve been developing a new feature of a public project in secret, in my own private Subversion repository. It’s almost entirely new code in a new directory. There’s only one file that’s based on an existing file, and it’s been heavily rewritten. There will come a time when I will want to publish this new code to the project’s public Subversion repository. At that time, I could export the code from my private repository and import it to the public one, but this would lose my history. Is there a way to preserve the history — replay the revisions in order somehow? Other developers of this public project seem to be doing so, but I believe they are making their modifications locally in git clones of the public Subversion repository, and then using git-svn to later commit the revisions to the public Subversion repository. I have not used git-svn and am not comfortable using git which is why I did not attempt this method. My private repository is not an svnsync’d copy of the public repository; it’s just an empty repository with my code in it. I don’t have administrative access to the public repository so I cannot “svnadmin load” anything, nor would I want to import the revisions verbatim: for example, I would not want the original commit date and commit author to be preserved; the commit date should be the date when I publish to the public repository, and the author should be my id in the public repository, as with any other of my commits.
Re: Import history from a second repository
On Sun, Mar 30, 2014 at 8:51 PM, Ryan Schmidt wrote: > I've been developing a new feature of a public project in secret, in my own > private Subversion repository. It's almost entirely new code in a new > directory. There's only one file that's based on an existing file, and it's > been heavily rewritten. > > There will come a time when I will want to publish this new code to the > project's public Subversion repository. At that time, I could export the code > from my private repository and import it to the public one, but this would > lose my history. Is there a way to preserve the history -- replay the > revisions in order somehow? Other developers of this public project seem to > be doing so, but I believe they are making their modifications locally in git > clones of the public Subversion repository, and then using git-svn to later > commit the revisions to the public Subversion repository. I have not used > git-svn and am not comfortable using git which is why I did not attempt this > method. The git-svn toolkit actually works well for this. It's vital for environments where you want to record changes locally and don't have write access to the shared repository. I've been hesitant to mention this sort of approach to avoid irritating our core Subversion developers, but it's been invaluable to some of my work. > My private repository is not an svnsync'd copy of the public repository; it's > just an empty repository with my code in it. I don't have administrative > access to the public repository so I cannot "svnadmin load" anything, nor > would I want to import the revisions verbatim: for example, I would not want > the original commit date and commit author to be preserved; the commit date > should be the date when I publish to the public repository, and the author > should be my id in the public repository, as with any other of my commits. Well, I think your merge difficulty started right there. Can you refactor the changes of your current file against the master repository file, and isolate them to a set of well organized changes? Then manually import those changes into a git-svn based repository?
svn file compatibility 1.6, 1.8 on Fedora 20
I am on two different hosts with different SVN versions. Host1 is using svn client 1.6.18 and checks out all the files. Host2 is using svn client 1.8.8 and using NFS works on the same files as Host1. e.g. The actual files are shared across machines, not copies. I cannot upgrade the files with svn upgrade, since the files must irk on host1. Can someone please confirm that svn 1.8.8 cannot work on the files that were checked out with the older version. host2$ svn info libs svn: E155036: Please see the 'svn upgrade' command svn: E155036: The working copy at 'xxx/libs' is too old (format 10) to work with client version '1.8.8 (r1568071)' (expects format 31). You need to upgrade the working copy. My expectation would be that the newer client would be able to work with the older files without having to upgrade them, just not supporting the newer features. Failing that, how do I install svn 1.6.8 on Fedora 2? I tried to install subversion-1.6.17-5.fc16.x86_64.rpm, and I tried building from rpm source but there are too many incompatible libraries. Thanks in advance, Marc
having trouble resolving a "make check test": FAIL: wc_tests.py 7: inaccessible .svn/wc.db
Hi, and thanks in advance for your assistance. I'm a newbie. But, I'm
learning
I'm preparing to "make install" Subversion 1.8.8 on a centos 5.9 box using the
following prerequisites:
Apr-Util-1.5.3
SQLite-3.8.4.1
OpenSSL-1.0.1f
Serf-1.3.4
Python 2.7.6 (also have the default Python 2.4 installed)
I was able to "make" just fine. But, I keep getting 1 fail error on test 96/96
on wc-tests.py (specifically wc-tests.py 7) when running a "make check". Below
is sample of what i get when i try to run a test on the file in question:
# make check TESTS=subversion/tests/cmdline/wc_tests.py
[1/1] wc_tests.pyFAILURE
At least one test was SKIPPED, checking /home/cprdev/subversion-1.8.8/tests.log
SKIP: wc_tests.py 11: missing .svn/wc.db and .svn/entries
At least one test XFAILED, checking /home/cprdev/subversion-1.8.8/tests.log
XFAIL: wc_tests.py 1: file status through unversioned symlink
XFAIL: wc_tests.py 2: file status through versioned symlink
XFAIL: wc_tests.py 3: file status with not-parent symlink
XFAIL: wc_tests.py 4: add file through unversioned symlink
XFAIL: wc_tests.py 5: add file through versioned symlink
XFAIL: wc_tests.py 6: add file with not-parent symlink
At least one test FAILED, checking /home/cprdev/subversion-1.8.8/tests.log
FAIL: wc_tests.py 7: inaccessible .svn/wc.db
Summary of test results:
6 tests PASSED
1 test SKIPPED
6 tests XFAILED
1 test FAILED
SUMMARY: Some tests failed.
make: *** [check] Error 1 the following error whe
...and here is my log file:
START: wc_tests.py
W: Couldn't find node 'wc_tests-1' in actual status tree
W: * Node name: wc_tests-1
Path: svn-test-work/working_copies/wc_tests-1
Contents: None
Properties: {}
Attributes: {'status': ' ', 'wc_rev': '1'}
Children: None (node is probably a file)
W: ACTUAL STATUS TREE:
svntest.wc.State(wc_dir, {})
W: CWD: /home/cprdev/subversion-1.8.8/subversion/tests/cmdline
W: EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/main.py", line
1550, in run
rc = self.pred.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 114, in run
return self._delegate.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 254, in run
return self._delegate.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File "/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/wc_tests.py",
line 61, in status_through_unversioned_symlink
svntest.actions.run_and_verify_status(sbox.ospath('Z/mu'), state)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/actions.py",
line 1479, in run_and_verify_status
status_tree.compare_and_display('status', actual_status)
File "/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/wc.py",
line 338, in compare_and_display
default_singleton_handler('actual ' + label, path, norm_self.desc[path])
File "/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/wc.py",
line 1048, in default_singleton_handler
raise svntest.tree.SVNTreeUnequal
SVNTreeUnequal
XFAIL: wc_tests.py 1: file status through unversioned symlink
W: Couldn't find node 'wc_tests-2' in actual status tree
W: * Node name: wc_tests-2
Path: svn-test-work/working_copies/wc_tests-2
Contents: None
Properties: {}
Attributes: {'status': ' ', 'wc_rev': '1'}
Children: None (node is probably a file)
W: ACTUAL STATUS TREE:
svntest.wc.State(wc_dir, {})
W: CWD: /home/cprdev/subversion-1.8.8/subversion/tests/cmdline
W: EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/main.py", line
1550, in run
rc = self.pred.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 114, in run
return self._delegate.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 254, in run
return self._delegate.run(sandbox)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File "/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/wc_tests.py",
line 74, in status_through_versioned_symlink
svntest.actions.run_and_verify_status(sbox.ospath('Z/mu'), state)
File
"/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/actions.py",
line 1479, in run_and_verify_status
status_tree.compare_and_display('status', actual_status)
File "/home/cprdev/subversion-1.8.8/subversion/tests/cmdline/svntest/wc.py",
line 338, in compare_and_display
default_singleton_handler('actual ' + label, path, norm_self.desc[path])
File "/home/cpr
SVN issue
Hello, After setting up SVN protocol (using svnserve windows process) I get this kind of error when perform commit. Regards, Omer Abramovich IS/ITDepartment Mobile 052.8588.111 [Syverse Logo] <> svn-crash-log20140327204608.log Description: svn-crash-log20140327204608.log svn-crash-log20140327204608.dmp Description: svn-crash-log20140327204608.dmp
Re: svn file compatibility 1.6, 1.8 on Fedora 20
Guten Tag Marc Pawlowsky, am Samstag, 29. März 2014 um 19:22 schrieben Sie: > Can someone please confirm that svn 1.8.8 cannot work on the files > that were checked out with the older version. It's documented in the release notes: > Subversion 1.8, however, requires an upgrade for both read and write > operations on the working copy, and makes the upgrade a manual step. > Before using Subversion 1.8 with existing working copies, users will > be required to run the svn upgrade command to upgrade working copy > metadata to the new format. https://subversion.apache.org/docs/release-notes/1.8.html > Failing that, how do I install svn 1.6.8 on Fedora 2? I tried to > install subversion-1.6.17-5.fc16.x86_64.rpm, and I tried building > from rpm source but there are too many incompatible libraries. Does that mean that installing 1.8 works, but 1.6 does not? Can you try to upgrade the older client on host1 then? Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
